From 75b8b1d9678d232f790669c8ee0502756d92be50 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 25 Nov 2019 17:02:48 +0530 Subject: [PATCH] fix: added ref doctype and slide type in all slides --- .../doctype/setup_wizard_settings/setup_wizard_settings.py | 2 +- .../setup_wizard_settings/setup_wizard_settings.json | 2 +- .../add_a_few_customers/add_a_few_customers.json | 5 +++-- .../add_a_few_products_you_buy_or_sell.json | 5 +++-- .../add_a_few_suppliers/add_a_few_suppliers.json | 5 +++-- .../company_letter_head/company_letter_head.json | 5 +++-- .../welcome_to_erpnext!/welcome_to_erpnext!.json | 4 ++-- frappe/public/js/frappe/ui/onboarding_dialog.js | 2 +- 8 files changed, 17 insertions(+), 13 deletions(-) diff --git a/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py b/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py index 7b0ee157d5..9d8f4bff6c 100644 --- a/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py +++ b/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py @@ -72,7 +72,7 @@ def get_help_links(slide_doc): return links def get_submit_method(slide_doc): - if slide_doc.slide_type == 'Action': + if slide_doc.slide_type != 'Information': return frappe.scrub(slide_doc.app) + '.utilities.onboarding_utils.' + slide_doc.submit_method return None diff --git a/frappe/desk/setup_wizard_settings/setup_wizard_settings/setup_wizard_settings.json b/frappe/desk/setup_wizard_settings/setup_wizard_settings/setup_wizard_settings.json index c43846eeac..a1cc456e47 100644 --- a/frappe/desk/setup_wizard_settings/setup_wizard_settings/setup_wizard_settings.json +++ b/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-25 12:33:08.139851", + "modified": "2019-11-25 16:45:59.632160", "modified_by": "Administrator", "name": "Setup Wizard Settings", "owner": "Administrator", diff --git a/frappe/desk/setup_wizard_slide/add_a_few_customers/add_a_few_customers.json b/frappe/desk/setup_wizard_slide/add_a_few_customers/add_a_few_customers.json index 6fe3f767f1..673420de28 100644 --- a/frappe/desk/setup_wizard_slide/add_a_few_customers/add_a_few_customers.json +++ b/frappe/desk/setup_wizard_slide/add_a_few_customers/add_a_few_customers.json @@ -27,10 +27,11 @@ "idx": 0, "image_src": "/assets/erpnext/images/illustrations/customer.png", "max_count": 3, - "modified": "2019-11-25 12:18:42.676764", + "modified": "2019-11-25 16:45:27.813979", "modified_by": "Administrator", "name": "Add A Few Customers", "owner": "Administrator", + "ref_doctype": "Customer", "slide_desc": "", "slide_fields": [ { @@ -61,6 +62,6 @@ } ], "slide_title": "Add A Few Customers", - "slide_type": "Action", + "slide_type": "Create", "submit_method": "create_customers" } \ No newline at end of file diff --git a/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json b/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json index ce5df244d2..b5d8cb27b9 100644 --- a/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json +++ b/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json @@ -22,10 +22,11 @@ "idx": 0, "image_src": "/assets/erpnext/images/illustrations/product.png", "max_count": 3, - "modified": "2019-11-22 13:16:32.222715", + "modified": "2019-11-25 16:45:04.478402", "modified_by": "Administrator", "name": "Add A Few Products You Buy Or Sell", "owner": "Administrator", + "ref_doctype": "Item", "slide_desc": "", "slide_fields": [ { @@ -73,6 +74,6 @@ } ], "slide_title": "Add A Few Products You Buy Or Sell", - "slide_type": "Action", + "slide_type": "Create", "submit_method": "create_items" } \ No newline at end of file diff --git a/frappe/desk/setup_wizard_slide/add_a_few_suppliers/add_a_few_suppliers.json b/frappe/desk/setup_wizard_slide/add_a_few_suppliers/add_a_few_suppliers.json index becc639e37..2dc7aed55f 100644 --- a/frappe/desk/setup_wizard_slide/add_a_few_suppliers/add_a_few_suppliers.json +++ b/frappe/desk/setup_wizard_slide/add_a_few_suppliers/add_a_few_suppliers.json @@ -27,10 +27,11 @@ "idx": 0, "image_src": "/assets/erpnext/images/illustrations/supplier.png", "max_count": 3, - "modified": "2019-11-25 12:32:15.607842", + "modified": "2019-11-25 16:45:46.389579", "modified_by": "Administrator", "name": "Add A Few Suppliers", "owner": "Administrator", + "ref_doctype": "Supplier", "slide_desc": "", "slide_fields": [ { @@ -61,6 +62,6 @@ } ], "slide_title": "Add A Few Suppliers", - "slide_type": "Action", + "slide_type": "Create", "submit_method": "create_suppliers" } \ No newline at end of file diff --git a/frappe/desk/setup_wizard_slide/company_letter_head/company_letter_head.json b/frappe/desk/setup_wizard_slide/company_letter_head/company_letter_head.json index 8df46ca3a9..0aa07d781a 100644 --- a/frappe/desk/setup_wizard_slide/company_letter_head/company_letter_head.json +++ b/frappe/desk/setup_wizard_slide/company_letter_head/company_letter_head.json @@ -27,10 +27,11 @@ "idx": 0, "image_src": "/assets/erpnext/images/illustrations/letterhead.png", "max_count": 0, - "modified": "2019-11-25 12:32:56.679708", + "modified": "2019-11-25 16:44:48.923555", "modified_by": "Administrator", "name": "Company Letter Head", "owner": "Administrator", + "ref_doctype": "Letter Head", "slide_desc": "Attach Letterhead: (Keep it web friendly as 1024px by 128px)", "slide_fields": [ { @@ -45,6 +46,6 @@ } ], "slide_title": "Company Letter Head", - "slide_type": "Action", + "slide_type": "Create", "submit_method": "create_letterhead" } \ No newline at end of file diff --git a/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json b/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json index 0daeb51da0..7d4312af25 100644 --- a/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json +++ b/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json @@ -25,12 +25,12 @@ "idx": 0, "image_src": "/assets/erpnext/images/illustrations/onboard.png", "max_count": 0, - "modified": "2019-11-25 09:58:53.284461", + "modified": "2019-11-25 15:27:46.314226", "modified_by": "Administrator", "name": "Welcome to ERPNext!", "owner": "Administrator", "slide_desc": "Setting up an ERP can be overwhelming. But don't worry, we have got your back!
\nLet's setup your company.\nThis wizard will help you onboard to ERPNext in a short time!", "slide_fields": [], "slide_title": "Welcome to ERPNext!", - "slide_type": "Info" + "slide_type": "Information" } \ No newline at end of file diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js index 4b39dca7f4..a88dd6c2db 100644 --- a/frappe/public/js/frappe/ui/onboarding_dialog.js +++ b/frappe/public/js/frappe/ui/onboarding_dialog.js @@ -85,7 +85,7 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { } setup_action_button() { - (this.slide_type == 'Action') ? + (this.slide_type !== 'Information') ? this.$action_button.addClass('primary') : this.$action_button.removeClass('primary'); } };