vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #4158 from pratu16x7/toolbar-fix

Browse source 
[fix] Make toolbar only after reaching desk
This commit is contained in:
Rushabh Mehta 2017-09-22 10:31:41 +05:30 • committed by GitHub
commit 2d9e441cd0
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frappe/desk/page/setup_wizard/setup_wizard.js
View file

@ -26,11 +26,7 @@ frappe.setup = {
}
frappe.pages['setup-wizard'].on_page_load = function(wrapper) {
// setup page ui
$(".navbar:first").toggle(false);
var requires = ["/assets/frappe/css/animate.min.css"].concat(
frappe.boot.setup_wizard_requires || []);
var requires = (frappe.boot.setup_wizard_requires || []);
frappe.require(requires, function() {
frappe.call({
@ -38,7 +34,7 @@ frappe.pages['setup-wizard'].on_page_load = function(wrapper) {
freeze: true,
callback: function(r) {
frappe.setup.data.lang = r.message;
frappe.setup.run_event("before_load");
var wizard_settings = {
parent: wrapper,
@ -181,8 +177,8 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides {
localStorage.setItem("session_last_route", frappe.setup.welcome_page);
}
setTimeout(function() {
// frappe.ui.toolbar.clear_cache();
window.location = "/desk";
// Reload
window.location.href = '';
}, 2000);
setTimeout(()=> {
$('body').removeClass('setup-state');

2
frappe/public/js/frappe/desk.js
View file

@ -355,7 +355,7 @@ frappe.Application = Class.extend({
},
make_nav_bar: function() {
// toolbar
if(frappe.boot) {
if(frappe.boot && !frappe.boot.in_setup_wizard) {
frappe.frappe_toolbar = new frappe.ui.toolbar.Toolbar();
}

1
frappe/sessions.py
View file

@ -163,6 +163,7 @@ def get():
# check only when clear cache is done, and don't cache this
if frappe.local.request:
bootinfo["change_log"] = get_change_log()
bootinfo["in_setup_wizard"] = not cint(frappe.db.get_single_value('System Settings', 'setup_complete'))
bootinfo["is_first_startup"] = cint(frappe.db.get_single_value('System Settings', 'is_first_startup'))
bootinfo["metadata_version"] = frappe.cache().get_value("metadata_version")