From 7d2c96b2d4728f12d33d60e14861fedb59fc579b Mon Sep 17 00:00:00 2001
From: pratu16x7 <pratu16x7@gmail.com>
Date: Thu, 31 Aug 2017 14:57:14 +0530
Subject: [PATCH] [progress] add is_first_startup flag to show dialog

---
 .../system_settings/system_settings.json      | 34 +++++++++++++++++--
 .../desk/page/setup_wizard/setup_wizard.css   |  2 +-
 frappe/desk/page/setup_wizard/setup_wizard.js | 15 --------
 frappe/desk/page/setup_wizard/setup_wizard.py |  5 +++
 frappe/public/js/frappe/ui/toolbar/toolbar.js | 10 ++++--
 frappe/sessions.py                            |  1 +
 6 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json
index 6405a275bf..42f873509a 100644
--- a/frappe/core/doctype/system_settings/system_settings.json
+++ b/frappe/core/doctype/system_settings/system_settings.json
@@ -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": "", 
diff --git a/frappe/desk/page/setup_wizard/setup_wizard.css b/frappe/desk/page/setup_wizard/setup_wizard.css
index 21fcd66970..2463c0f1e4 100644
--- a/frappe/desk/page/setup_wizard/setup_wizard.css
+++ b/frappe/desk/page/setup_wizard/setup_wizard.css
@@ -14,7 +14,7 @@
 }
 
 .setup-wizard-slide .slides-progress {
-	margin-top: 10px;
+	margin-top: 20px;
 }
 
 .setup-wizard-slide .lead {
diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js
index 7068b11077..febe27a576 100644
--- a/frappe/desk/page/setup_wizard/setup_wizard.js
+++ b/frappe/desk/page/setup_wizard/setup_wizard.js
@@ -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
diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py
index 87a574cba2..db9f29fc80 100755
--- a/frappe/desk/page/setup_wizard/setup_wizard.py
+++ b/frappe/desk/page/setup_wizard/setup_wizard.py
@@ -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():
diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js
index 84ce047288..474d00ccf5 100644
--- a/frappe/public/js/frappe/ui/toolbar/toolbar.js
+++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js
@@ -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: () => {}
+								});
+							}
+
 						});
 					}
 				}
diff --git a/frappe/sessions.py b/frappe/sessions.py
index 0a0f7e04bd..bbb547f3c1 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -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"]: