@@ -159,6 +159,36 @@ | |||||
"set_only_once": 0, | "set_only_once": 0, | ||||
"unique": 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_bulk_edit": 0, | ||||
"allow_on_submit": 0, | "allow_on_submit": 0, | ||||
@@ -1186,8 +1216,8 @@ | |||||
"issingle": 1, | "issingle": 1, | ||||
"istable": 0, | "istable": 0, | ||||
"max_attachments": 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", | "module": "Core", | ||||
"name": "System Settings", | "name": "System Settings", | ||||
"name_case": "", | "name_case": "", | ||||
@@ -14,7 +14,7 @@ | |||||
} | } | ||||
.setup-wizard-slide .slides-progress { | .setup-wizard-slide .slides-progress { | ||||
margin-top: 10px; | |||||
margin-top: 20px; | |||||
} | } | ||||
.setup-wizard-slide .lead { | .setup-wizard-slide .lead { | ||||
@@ -233,7 +233,6 @@ frappe.setup.SetupWizardSlide = class SetupWizardSlide extends frappe.ui.Slide { | |||||
super.make(); | super.make(); | ||||
this.set_init_values(); | this.set_init_values(); | ||||
this.reset_action_button_state(); | this.reset_action_button_state(); | ||||
// this.setup_keyboard_nav(); | |||||
} | } | ||||
set_init_values () { | 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 | // Frappe slides settings | ||||
@@ -151,6 +151,7 @@ def add_all_roles_to(name): | |||||
def disable_future_access(): | def disable_future_access(): | ||||
frappe.db.set_default('desktop:home_page', 'desktop') | 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', 'setup_complete', 1) | ||||
frappe.db.set_value('System Settings', 'System Settings', 'is_first_startup', 1) | |||||
if not frappe.flags.in_test: | if not frappe.flags.in_test: | ||||
# remove all roles and add 'Administrator' to prevent future access | # remove all roles and add 'Administrator' to prevent future access | ||||
@@ -202,6 +203,10 @@ def load_user_details(): | |||||
"email": frappe.cache().hget("email", "signup") | "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): | def prettify_args(args): | ||||
# remove attachments | # remove attachments | ||||
for key, val in args.items(): | for key, val in args.items(): | ||||
@@ -211,9 +211,15 @@ frappe.ui.toolbar.Toolbar = Class.extend({ | |||||
me.progress_dialog.show(); | me.progress_dialog.show(); | ||||
}); | }); | ||||
setTimeout(function() { | |||||
if (frappe.boot.is_first_startup) { | |||||
me.progress_dialog.show(); | me.progress_dialog.show(); | ||||
}, 5000); | |||||
frappe.call({ | |||||
method: "frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup", | |||||
args: {}, | |||||
callback: () => {} | |||||
}); | |||||
} | |||||
}); | }); | ||||
} | } | ||||
} | } | ||||
@@ -163,6 +163,7 @@ def get(): | |||||
# check only when clear cache is done, and don't cache this | # check only when clear cache is done, and don't cache this | ||||
if frappe.local.request: | if frappe.local.request: | ||||
bootinfo["change_log"] = get_change_log() | 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") | bootinfo["metadata_version"] = frappe.cache().get_value("metadata_version") | ||||
if not bootinfo["metadata_version"]: | if not bootinfo["metadata_version"]: | ||||