fix: code cleanup

frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py

@@ -25,7 +25,7 @@ class SetupWizardSettings(Document):
 				dt, dn = scrub_dt_dn('Setup Wizard Slide', s.slide)
 				create_init_py(get_module_path('Desk'), dt, dn)
 
-def get_slide_settings():
+def get_onboarding_slides_as_list():
 	slides = []
 	slide_settings = frappe.get_single('Setup Wizard Settings')
 	for entry in slide_settings.slide_order:
@@ -50,12 +50,12 @@ def get_slide_settings():
 @frappe.whitelist()
 def get_onboarding_slides():
 	slides = []
-	slide_settings = get_slide_settings()
+	slide_list = get_onboarding_slides_as_list()
 
-	domains = frappe.get_active_domains()
-	for s in slide_settings:
-		if not s.domains or any(d in domains for d in s.domains):
-			slides.append(s)
+	active_domains = frappe.get_active_domains()
+	for slide in slide_list:
+		if not slide.domains or any(domain in active_domains for domain in slide.domains):
+			slides.append(slide)
 	return slides
 
 def get_domains(slide_doc):

frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.py

@@ -21,7 +21,7 @@ def create_onboarding_docs(values, doctype=None, submit_method=None, app=None, s
 			create_generic_onboarding_doc(data, doctype, slide_type)
 	else:
 		doc = frappe.new_doc(doctype)
-		if doc.hasattr(doc, 'create_onboarding_docs'):
+		if hasattr(doc, 'create_onboarding_docs'):
 			doc.create_onboarding_docs(data)
 		else:
 			create_generic_onboarding_doc(data, doctype, slide_type)

frappe/desk/setup_wizard_settings/setup_wizard_settings/setup_wizard_settings.json

@@ -3,7 +3,7 @@
  "docstatus": 0,
  "doctype": "Setup Wizard Settings",
  "idx": "0",
- "modified": "2019-11-26 14:27:05.540320",
+ "modified": "2019-11-26 14:47:30.065799",
  "modified_by": "Administrator",
  "name": "Setup Wizard Settings",
  "owner": "Administrator",

frappe/desk/setup_wizard_slide/company_letter_head/company_letter_head.json

@@ -1,6 +1,6 @@
 {
  "add_more_button": 0,
- "app": "Frappe",
+ "app": "ERPNext",
  "creation": "2019-11-22 13:25:42.892593",
  "docstatus": 0,
  "doctype": "Setup Wizard Slide",
@@ -27,7 +27,7 @@
  "idx": 0,
  "image_src": "/assets/erpnext/images/illustrations/letterhead.png",
  "max_count": 0,
- "modified": "2019-11-26 14:19:00.315094",
+ "modified": "2019-11-26 14:47:22.595626",
  "modified_by": "Administrator",
  "name": "Company Letter Head",
  "owner": "Administrator",

frappe/public/js/frappe/desk.js

@@ -491,27 +491,23 @@ frappe.Application = Class.extend({
 
 	setup_onboarding_wizard: () => {
 		var me = this;
-		frappe.call({
-			method: "frappe.desk.doctype.setup_wizard_settings.setup_wizard_settings.get_onboarding_slides",
-			callback: function(r) {
-				if(r.message) {
-					let slides = r.message;
-					if(slides.length) {
-						frappe.require("assets/frappe/js/frappe/ui/onboarding_dialog.js", () => {
-							me.progress_dialog = new frappe.setup.OnboardingDialog({
-								slides: slides
-							});
-							me.progress_dialog.show();
-							frappe.call({
-								method: "frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup",
-								args: {},
-								callback: () => {}
-							});
+		frappe.call('frappe.desk.doctype.setup_wizard_settings.setup_wizard_settings.get_onboarding_slides').then(res => {
+			if (res.message) {
+				let slides = res.message;
+				if (slides.length) {
+					frappe.require("assets/frappe/js/frappe/ui/onboarding_dialog.js", () => {
+						me.progress_dialog = new frappe.setup.OnboardingDialog({
+							slides: slides
 						});
-					}
+						me.progress_dialog.show();
+						frappe.call({
+							method: "frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup",
+							args: {},
+							callback: () => {}
+						});
+					});
 				}
-			},
-			freeze: false
+			}
 		});
 	},
 

frappe/public/js/frappe/ui/onboarding_dialog.js

@@ -89,8 +89,11 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide {
 	}
 
 	setup_action_button() {
-		(this.slide_type !== 'Information') ?
-			this.$action_button.addClass('primary') : this.$action_button.removeClass('primary');
+		if (this.slide_type !== 'Information') {
+			this.$action_button.addClass('primary');
+		} else {
+			this.$action_button.removeClass('primary');
+		}
 	}
 };