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

[progress] add is_first_startup flag to show dialog

Browse source
This commit is contained in:
pratu16x7 2017-08-31 14:57:14 +05:30
parent afea2ad1b0
commit 7d2c96b2d4
6 changed files with 47 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
frappe/core/doctype/system_settings/system_settings.json
View file

@ -159,6 +159,36 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "is_first_startup",
"fieldtype": "Check",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Is First Startup",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@ -1186,8 +1216,8 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
"modified": "2017-08-07 23:29:18.858797",
"modified_by": "Administrator",
"modified": "2017-08-31 14:53:31.065925",
"modified_by": "ewfds@wfe.ef",
"module": "Core",
"name": "System Settings",
"name_case": "",

2
frappe/desk/page/setup_wizard/setup_wizard.css
View file

@ -14,7 +14,7 @@
}
.setup-wizard-slide .slides-progress {
margin-top: 10px;
margin-top: 20px;
}
.setup-wizard-slide .lead {

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

@ -233,7 +233,6 @@ frappe.setup.SetupWizardSlide = class SetupWizardSlide extends frappe.ui.Slide {
super.make();
this.set_init_values();
this.reset_action_button_state();
// this.setup_keyboard_nav();
}
set_init_values () {
@ -249,20 +248,6 @@ frappe.setup.SetupWizardSlide = class SetupWizardSlide extends frappe.ui.Slide {
}
}
// setup_keyboard_nav() {
// var me = this;
// this.$body.on('keypress', function(e) {
// if(e.which === 13) {
// var $target = $(e.target);
// if($target.hasClass('prev-btn')) {
// me.prev();
// } else {
// me.next_or_complete();
// e.preventDefault();
// }
// }
// });
// }
};
// Frappe slides settings

5
frappe/desk/page/setup_wizard/setup_wizard.py
View file

@ -151,6 +151,7 @@ def add_all_roles_to(name):
def disable_future_access():
frappe.db.set_default('desktop:home_page', 'desktop')
frappe.db.set_value('System Settings', 'System Settings', 'setup_complete', 1)
frappe.db.set_value('System Settings', 'System Settings', 'is_first_startup', 1)
if not frappe.flags.in_test:
# remove all roles and add 'Administrator' to prevent future access
@ -202,6 +203,10 @@ def load_user_details():
"email": frappe.cache().hget("email", "signup")
}
@frappe.whitelist()
def reset_is_first_startup():
frappe.db.set_value('System Settings', 'System Settings', 'is_first_startup', 0)
def prettify_args(args):
# remove attachments
for key, val in args.items():

10
frappe/public/js/frappe/ui/toolbar/toolbar.js
View file

@ -211,9 +211,15 @@ frappe.ui.toolbar.Toolbar = Class.extend({
me.progress_dialog.show();
});
setTimeout(function() {
if (frappe.boot.is_first_startup) {
me.progress_dialog.show();
}, 5000);
frappe.call({
method: "frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup",
args: {},
callback: () => {}
});
}
});
}
}

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["is_first_startup"] = cint(frappe.db.get_single_value('System Settings', 'is_first_startup'))
bootinfo["metadata_version"] = frappe.cache().get_value("metadata_version")
if not bootinfo["metadata_version"]: