From 8dafb6dc0548ff75b227eba0a49ff900c177a65d Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 30 Oct 2018 15:58:35 +0530 Subject: [PATCH 01/20] [fix] toggle title based on setup status --- frappe/www/update-password.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html index 8af2dca2e6..9e5ab57bd4 100644 --- a/frappe/www/update-password.html +++ b/frappe/www/update-password.html @@ -6,7 +6,7 @@
- {{ _("Reset Password") }} + {{ _("Reset Password") if frappe.db.get_default('company') else _("Set Password")}}
From 5dceb7fb423a4849b593e6e88af12ff7db1312a6 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 2 Nov 2018 15:38:19 +0530 Subject: [PATCH 02/20] provision to setup password while adding system manager --- frappe/commands/site.py | 6 ++++-- frappe/utils/user.py | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 708f8f5e7d..8ae39d5b4e 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -183,15 +183,17 @@ def list_apps(context): @click.argument('email') @click.option('--first-name') @click.option('--last-name') +@click.option('--password') @click.option('--send-welcome-email', default=False, is_flag=True) @pass_context -def add_system_manager(context, email, first_name, last_name, send_welcome_email): +def add_system_manager(context, email, first_name, last_name, send_welcome_email, password): "Add a new system manager to a site" import frappe.utils.user for site in context.sites: frappe.connect(site=site) try: - frappe.utils.user.add_system_manager(email, first_name, last_name, send_welcome_email) + frappe.utils.user.add_system_manager(email, first_name, last_name, + send_welcome_email, password) frappe.db.commit() finally: frappe.destroy() diff --git a/frappe/utils/user.py b/frappe/utils/user.py index 0cc23893b7..f6042cf921 100755 --- a/frappe/utils/user.py +++ b/frappe/utils/user.py @@ -256,7 +256,7 @@ def get_system_managers(only_name=False): def add_role(user, role): frappe.get_doc("User", user).add_roles(role) -def add_system_manager(email, first_name=None, last_name=None, send_welcome_email=False): +def add_system_manager(email, first_name=None, last_name=None, send_welcome_email=False, password=None): # add user user = frappe.new_doc("User") user.update({ @@ -269,6 +269,11 @@ def add_system_manager(email, first_name=None, last_name=None, send_welcome_emai "send_welcome_email": 1 if send_welcome_email else 0 }) + if password: + user.update({ + "new_password": password + }) + user.insert() # add roles From 50af0dc3883b0cea19775ab7161329aa662dd4d3 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Fri, 2 Nov 2018 11:12:35 +0530 Subject: [PATCH 03/20] remove setup progress --- frappe/public/js/frappe/misc/utils.js | 9 ++++ frappe/public/js/frappe/router.js | 19 +++++--- .../public/js/frappe/ui/toolbar/navbar.html | 7 --- frappe/public/js/frappe/ui/toolbar/toolbar.js | 47 +++++-------------- frappe/public/less/flex.less | 15 ++++++ 5 files changed, 49 insertions(+), 48 deletions(-) diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js index e93a45decc..a9e058c0b2 100644 --- a/frappe/public/js/frappe/misc/utils.js +++ b/frappe/public/js/frappe/misc/utils.js @@ -92,6 +92,15 @@ Object.assign(frappe.utils, { return txt.toLowerCase().substr(0,7)=='http://' || txt.toLowerCase().substr(0,8)=='https://' }, + to_title_case: function(string, with_space=false) { + let titlecased_string = string.toLowerCase().replace(/(?:^|[\s-/])\w/g, function (match) { + return match.toUpperCase(); + }); + + let replace_with = with_space ? ' ' : ''; + + return titlecased_string.replace(/-|_/g, replace_with); + }, toggle_blockquote: function(txt) { if (!txt) return txt; diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 4f6b47fb32..9ad05edc34 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -39,13 +39,20 @@ frappe.route = function() { frappe.route_history.push(route); - if(route[0] && route[1] && frappe.views[route[0] + "Factory"]) { - // has a view generator, generate! - if(!frappe.view_factory[route[0]]) { - frappe.view_factory[route[0]] = new frappe.views[route[0] + "Factory"](); - } + if(route[0]) { + const title_cased_route = frappe.utils.to_title_case(route[0]); - frappe.view_factory[route[0]].show(); + if(route[1] && frappe.views[title_cased_route + "Factory"]) { + // has a view generator, generate! + if(!frappe.view_factory[title_cased_route]) { + frappe.view_factory[title_cased_route] = new frappe.views[title_cased_route + "Factory"](); + } + + frappe.view_factory[title_cased_route].show(); + } else { + // show page + frappe.views.pageview.show(route[0]); + } } else { // show page const route_name = frappe.utils.xss_sanitise(route[0]); diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html index bee71db847..dc13b357cc 100644 --- a/frappe/public/js/frappe/ui/toolbar/navbar.html +++ b/frappe/public/js/frappe/ui/toolbar/navbar.html @@ -11,13 +11,6 @@
    -
  • - -
    -
    -
    -     -
    • diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js index 5f31676a36..d1993bf07b 100644 --- a/frappe/public/js/frappe/ui/toolbar/toolbar.js +++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js @@ -22,8 +22,6 @@ frappe.ui.toolbar.Toolbar = Class.extend({ this.setup_sidebar(); this.setup_help(); - this.setup_modules_dialog(); - this.setup_progress_dialog(); this.bind_events(); $(document).trigger('toolbar_setup'); @@ -202,39 +200,6 @@ frappe.ui.toolbar.Toolbar = Class.extend({ } }, - setup_progress_dialog: function() { - var me = this; - frappe.call({ - method: "frappe.desk.user_progress.get_user_progress_slides", - callback: function(r) { - if(r.message) { - let slides = r.message; - if(slides.length && slides.map(s => parseInt(s.done)).includes(0)) { - frappe.require("assets/frappe/js/frappe/ui/toolbar/user_progress_dialog.js", function() { - me.progress_dialog = new frappe.setup.UserProgressDialog({ - slides: slides - }); - $('.user-progress').removeClass('hide'); - $('.user-progress .dropdown-toggle').on('click', () => { - me.progress_dialog.show(); - }); - - if (cint(frappe.boot.sysdefaults.is_first_startup)) { - me.progress_dialog.show(); - frappe.call({ - method: "frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup", - args: {}, - callback: () => {} - }); - } - - }); - } - } - }, - freeze: false - }); - } }); $.extend(frappe.ui.toolbar, { @@ -260,6 +225,18 @@ $.extend(frappe.ui.toolbar, { frappe.ui.toolbar.get_menu(menu) : menu; $('
  • ').prependTo(menu); + }, + add_icon_link(route, icon, index, class_name) { + let parent_element = $(".navbar-right").get(0); + let new_element = $(`
  • + +
    + +
    +     +
    • `).get(0); + + parent_element.insertBefore(new_element, parent_element.children[index]); } }); diff --git a/frappe/public/less/flex.less b/frappe/public/less/flex.less index f68946487a..598e6fb0b0 100644 --- a/frappe/public/less/flex.less +++ b/frappe/public/less/flex.less @@ -3,6 +3,7 @@ } .flex-column { + .flex; flex-direction: column; } @@ -22,6 +23,20 @@ justify-content: space-between } +.justify-flex-end { + justify-content: flex-end; +} + +.justify-flex-start { + justify-content: flex-start; +} + +.flush-top { + display: flex; + justify-content: space-between; + align-items: end; +} + .level { display: flex; justify-content: space-between; From 0ccb159c6f1070f7eda96eac91fc1c854f1df093 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Wed, 7 Nov 2018 12:07:19 +0530 Subject: [PATCH 04/20] Add make_records() --- frappe/commands/utils.py | 15 +++- frappe/desk/notifications.py | 2 +- frappe/desk/page/setup_wizard/setup_wizard.py | 68 +++++++++++++++++++ frappe/public/js/frappe/desk.js | 5 ++ frappe/public/js/frappe/ui/dialog.js | 8 +++ frappe/utils/install.py | 7 +- 6 files changed, 100 insertions(+), 5 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index adb8ccf7b4..94bc040ac5 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -9,6 +9,8 @@ from frappe.commands import pass_context, get_site from frappe.utils import update_progress_bar, get_bench_path from frappe.utils.response import json_handler from coverage import Coverage +import cProfile, pstats +from six import StringIO @click.command('build') @click.option('--app', help='Build assets for app') @@ -98,8 +100,9 @@ def reset_perms(context): @click.argument('method') @click.option('--args') @click.option('--kwargs') +@click.option('--profile', is_flag=True, default=False) @pass_context -def execute(context, method, args=None, kwargs=None): +def execute(context, method, args=None, kwargs=None, profile=False): "Execute a function" for site in context.sites: try: @@ -119,8 +122,18 @@ def execute(context, method, args=None, kwargs=None): else: kwargs = {} + if profile: + pr = cProfile.Profile() + pr.enable() + ret = frappe.get_attr(method)(*args, **kwargs) + if profile: + pr.disable() + s = StringIO() + ps = pstats.Stats(pr, stream=s).sort_stats('cumulative').print_stats(.5) + print(s.getvalue()) + if frappe.db: frappe.db.commit() finally: diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py index 7a5676cca6..f0b0cd62b6 100644 --- a/frappe/desk/notifications.py +++ b/frappe/desk/notifications.py @@ -28,7 +28,7 @@ def get_notifications(): notification_count[name] = count return { - "open_count_doctype": get_notifications_for_doctypes(config, notification_count), + "open_count_doctype": {}, "open_count_module": get_notifications_for_modules(config, notification_count), "open_count_other": get_notifications_for_other(config, notification_count), "targets": get_notifications_for_targets(config, notification_percent), diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py index ed6b0eacb7..9af3ffd344 100755 --- a/frappe/desk/page/setup_wizard/setup_wizard.py +++ b/frappe/desk/page/setup_wizard/setup_wizard.py @@ -349,3 +349,71 @@ def enable_twofactor_all_roles(): all_role.two_factor_auth = True all_role.save(ignore_permissions=True) +def make_records(records, debug=False): + from frappe import _dict + from frappe.modules import scrub + from time import time + + root_time_start = time() + + # LOG every success and failure + for record in records: + + doctype = record.get("doctype") + condition = record.get('__condition') + + if condition and not condition(): + continue + + doc = frappe.new_doc(doctype) + doc.update(record) + + # ignore mandatory for root + parent_link_field = ("parent_" + scrub(doc.doctype)) + if doc.meta.get_field(parent_link_field) and not doc.get(parent_link_field): + doc.flags.ignore_mandatory = True + + try: + if debug: + time_start = time() + + doc.insert(ignore_permissions=True) + + exec_time_str = "" + if debug: + time_end = time() + exec_time_str = ": {0} sec".format(round(time_end - time_start, 2)) + + print("Inserted {0} {1}".format(doctype, doc.name) + exec_time_str) + + except frappe.DuplicateEntryError as e: + print("Failed to insert duplicate {0} {1}".format(doctype, doc.name)) + + # pass DuplicateEntryError and continue + if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name: + # make sure DuplicateEntryError is for the exact same doc and not a related doc + pass + else: + raise + + except Exception as e: + print("Failed to insert {0} {1}".format(doctype, doc.name)) + + exception = record.get('__exception') + if exception: + config = _dict(exception) + if type(e) == config.exception: + config.handler() + else: + show_document_insert_error() + else: + show_document_insert_error() + + finally: + root_time_end = time() + total_time = round(root_time_end - root_time_start, 2) + print("Completion: {0} sec".format(total_time)) + +def show_document_insert_error(): + print("Document Insert Error") + print(frappe.get_traceback()) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index ed4bcfd3d9..a80feaecf2 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -80,6 +80,11 @@ frappe.Application = Class.extend({ this.show_update_available(); + if(frappe.ui.startup_setup_dialog) { + frappe.ui.startup_setup_dialog.pre_show(); + frappe.ui.startup_setup_dialog.show(); + } + // listen to csrf_update frappe.realtime.on("csrf_generated", function(data) { // handles the case when a user logs in again from another tab diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index 2815cbbda3..cd76db91d4 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -20,6 +20,14 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup { make() { this.$wrapper = frappe.get_modal("", ""); + if(this.static) { + this.$wrapper.modal({ + backdrop: 'static', + keyboard: false + }); + this.get_close_btn().hide(); + } + this.wrapper = this.$wrapper.find('.modal-dialog') .get(0); if ( this.size == "small" ) diff --git a/frappe/utils/install.py b/frappe/utils/install.py index b84e292397..28813b2904 100644 --- a/frappe/utils/install.py +++ b/frappe/utils/install.py @@ -36,8 +36,9 @@ def after_install(): # update admin password update_password("Administrator", get_admin_password()) - # setup wizard now in frappe - frappe.db.set_default('desktop:home_page', 'setup-wizard') + # setup_conf = frappe._dict(frappe.local.conf.setup) + # if setup_conf and not setup_conf.skip_setup_wizard: + # frappe.db.set_default('desktop:home_page', 'setup-wizard') # clear test log with open(frappe.get_site_path('.test_log'), 'w') as f: @@ -157,4 +158,4 @@ def add_country_and_currency(name, country): "smallest_currency_fraction_value": country.smallest_currency_fraction_value, "number_format": country.number_format, "docstatus": 0 - }).db_insert() \ No newline at end of file + }).db_insert() From 7b4a4bc5b7016d4fcc02af0a792aa3cb3e00741e Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 13 Nov 2018 15:53:39 +0530 Subject: [PATCH 05/20] [setup] startup setup dialog if setup not complete --- frappe/public/js/frappe/desk.js | 2 +- frappe/sessions.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index a80feaecf2..84f4912db0 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -80,7 +80,7 @@ frappe.Application = Class.extend({ this.show_update_available(); - if(frappe.ui.startup_setup_dialog) { + if(frappe.ui.startup_setup_dialog && !frappe.boot.setup_complete) { frappe.ui.startup_setup_dialog.pre_show(); frappe.ui.startup_setup_dialog.show(); } diff --git a/frappe/sessions.py b/frappe/sessions.py index d4555ddfc6..aaf40f30e7 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -153,6 +153,8 @@ def get(): bootinfo["lang"] = frappe.translate.get_user_lang() bootinfo["disable_async"] = frappe.conf.disable_async + bootinfo["setup_complete"] = cint(frappe.db.get_single_value('System Settings', 'setup_complete')) + # limits bootinfo.limits = get_limits() bootinfo.expiry_message = get_expiry_message() From f05486f814daf37a7c8dd9c9c9348aaffa879255 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Wed, 14 Nov 2018 10:26:00 +0530 Subject: [PATCH 06/20] [comment][fix] add pre-existing clear method --- frappe/public/js/frappe/form/controls/comment.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/comment.js b/frappe/public/js/frappe/form/controls/comment.js index bd7189d5f3..3abbbd0ff6 100644 --- a/frappe/public/js/frappe/form/controls/comment.js +++ b/frappe/public/js/frappe/form/controls/comment.js @@ -124,4 +124,8 @@ frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({ ['clean'] ]; }, -}); \ No newline at end of file + + clear() { + this.quill.setText(''); + } +}); From 76386603a4dffb47f87aeeceebfb6eb55dfe48b0 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Mon, 19 Nov 2018 15:15:53 +0530 Subject: [PATCH 07/20] [setup] Address template message if setup complete --- frappe/contacts/doctype/address_template/address_template.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/contacts/doctype/address_template/address_template.py b/frappe/contacts/doctype/address_template/address_template.py index 9336f75027..2ca9aebff5 100644 --- a/frappe/contacts/doctype/address_template/address_template.py +++ b/frappe/contacts/doctype/address_template/address_template.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document +from frappe.utils import cint from frappe.utils.jinja import validate_template from frappe import _ @@ -17,7 +18,8 @@ class AddressTemplate(Document): if not self.is_default: if not self.defaults: self.is_default = 1 - frappe.msgprint(_("Setting this Address Template as default as there is no other default")) + if cint(frappe.db.get_single_value('System Settings', 'setup_complete')): + frappe.msgprint(_("Setting this Address Template as default as there is no other default")) validate_template(self.template) From 1f1e70d335411c4a2b57d83fb938007653347c1a Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Mon, 19 Nov 2018 15:26:06 +0530 Subject: [PATCH 08/20] [fix] Better multiple root node message --- frappe/commands/utils.py | 2 +- frappe/desk/page/setup_wizard/setup_wizard.py | 2 +- frappe/public/js/frappe/misc/utils.js | 2 +- frappe/utils/nestedset.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 94bc040ac5..c920b9d6a6 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -131,7 +131,7 @@ def execute(context, method, args=None, kwargs=None, profile=False): if profile: pr.disable() s = StringIO() - ps = pstats.Stats(pr, stream=s).sort_stats('cumulative').print_stats(.5) + pstats.Stats(pr, stream=s).sort_stats('cumulative').print_stats(.5) print(s.getvalue()) if frappe.db: diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py index 9af3ffd344..531a4ff255 100755 --- a/frappe/desk/page/setup_wizard/setup_wizard.py +++ b/frappe/desk/page/setup_wizard/setup_wizard.py @@ -402,7 +402,7 @@ def make_records(records, debug=False): exception = record.get('__exception') if exception: config = _dict(exception) - if type(e) == config.exception: + if isinstance(e, config.exception): config.handler() else: show_document_insert_error() diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js index a9e058c0b2..ce7c592f55 100644 --- a/frappe/public/js/frappe/misc/utils.js +++ b/frappe/public/js/frappe/misc/utils.js @@ -93,7 +93,7 @@ Object.assign(frappe.utils, { || txt.toLowerCase().substr(0,8)=='https://' }, to_title_case: function(string, with_space=false) { - let titlecased_string = string.toLowerCase().replace(/(?:^|[\s-/])\w/g, function (match) { + let titlecased_string = string.toLowerCase().replace(/(?:^|[\s-/])\w/g, function(match) { return match.toUpperCase(); }); diff --git a/frappe/utils/nestedset.py b/frappe/utils/nestedset.py index bc982e8904..8bef19cedb 100644 --- a/frappe/utils/nestedset.py +++ b/frappe/utils/nestedset.py @@ -237,7 +237,7 @@ class NestedSet(Document): if not self.get(self.nsm_parent_field): if frappe.db.sql("""select count(*) from `tab%s` where ifnull(%s, '')=''""" % (self.doctype, self.nsm_parent_field))[0][0] > 1: - frappe.throw(_("""Multiple root nodes not allowed."""), NestedSetMultipleRootsError) + frappe.throw(_("""Multiple root nodes not allowed: {0} {1}""".format(self.doctype, self.nsm_parent_field)), NestedSetMultipleRootsError) def validate_ledger(self, group_identifier="is_group"): if hasattr(self, group_identifier) and not bool(self.get(group_identifier)): From 31c9e5a07828b55369f1552ee3f7a69504f2111f Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Mon, 19 Nov 2018 15:53:31 +0530 Subject: [PATCH 09/20] [setup] check skip_setup_wizard from common_site_comfig --- frappe/utils/install.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/utils/install.py b/frappe/utils/install.py index 28813b2904..2d18257c41 100644 --- a/frappe/utils/install.py +++ b/frappe/utils/install.py @@ -36,9 +36,8 @@ def after_install(): # update admin password update_password("Administrator", get_admin_password()) - # setup_conf = frappe._dict(frappe.local.conf.setup) - # if setup_conf and not setup_conf.skip_setup_wizard: - # frappe.db.set_default('desktop:home_page', 'setup-wizard') + if not frappe.conf.skip_setup_wizard: + frappe.db.set_default('desktop:home_page', 'setup-wizard') # clear test log with open(frappe.get_site_path('.test_log'), 'w') as f: From ec9eb6d3adb0216f272b43e14ce492ce3b2601a7 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Fri, 23 Nov 2018 16:27:17 +0530 Subject: [PATCH 10/20] [fix] expand dropdown height --- frappe/public/less/common.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less index 8d77191410..8ab34dfa6d 100644 --- a/frappe/public/less/common.less +++ b/frappe/public/less/common.less @@ -116,7 +116,7 @@ kbd { min-width: 200px; padding: 0px; font-size: @text-medium; - max-height: 400px; + max-height: 500px; overflow: auto; // only rounded bottoms border-radius: 0px 0px 4px 4px; From bf57a4d201eb3ede9b52e04ce8d2898296c99fb5 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Wed, 28 Nov 2018 13:43:28 +0530 Subject: [PATCH 11/20] [fix] remove print statements to not raise unicode issues --- frappe/desk/page/setup_wizard/setup_wizard.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py index 531a4ff255..3860645f2a 100755 --- a/frappe/desk/page/setup_wizard/setup_wizard.py +++ b/frappe/desk/page/setup_wizard/setup_wizard.py @@ -384,10 +384,10 @@ def make_records(records, debug=False): time_end = time() exec_time_str = ": {0} sec".format(round(time_end - time_start, 2)) - print("Inserted {0} {1}".format(doctype, doc.name) + exec_time_str) + # print("Inserted {0} {1}".format(doctype, doc.name) + exec_time_str) except frappe.DuplicateEntryError as e: - print("Failed to insert duplicate {0} {1}".format(doctype, doc.name)) + # print("Failed to insert duplicate {0} {1}".format(doctype, doc.name)) # pass DuplicateEntryError and continue if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name: @@ -397,7 +397,7 @@ def make_records(records, debug=False): raise except Exception as e: - print("Failed to insert {0} {1}".format(doctype, doc.name)) + # print("Failed to insert {0} {1}".format(doctype, doc.name)) exception = record.get('__exception') if exception: From c964d1420c21de15e644e65c1491676a23abbcc9 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Mon, 3 Dec 2018 14:42:36 +0530 Subject: [PATCH 12/20] [custom-field] Admin-owned programmed fields --- frappe/custom/doctype/custom_field/custom_field.py | 5 ++++- frappe/desk/doctype/kanban_board/kanban_board.py | 3 ++- frappe/workflow/doctype/workflow/workflow.py | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/frappe/custom/doctype/custom_field/custom_field.py b/frappe/custom/doctype/custom_field/custom_field.py index b581dd396c..10eca8a1b9 100644 --- a/frappe/custom/doctype/custom_field/custom_field.py +++ b/frappe/custom/doctype/custom_field/custom_field.py @@ -107,7 +107,9 @@ def create_custom_field(doctype, df, ignore_validate=False): "dt": doctype, "permlevel": 0, "fieldtype": 'Data', - "hidden": 0 + "hidden": 0, + # Looks like we always use this programatically? + # "is_standard": 1 }) custom_field.update(df) custom_field.flags.ignore_validate = ignore_validate @@ -126,6 +128,7 @@ def create_custom_fields(custom_fields, ignore_validate = False, update=True): field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": df["fieldname"]}) if not field: try: + df["owner"] = "Administrator" create_custom_field(doctype, df, ignore_validate=ignore_validate) except frappe.exceptions.DuplicateEntryError: pass diff --git a/frappe/desk/doctype/kanban_board/kanban_board.py b/frappe/desk/doctype/kanban_board/kanban_board.py index 19f3daefe3..a1df694f6e 100644 --- a/frappe/desk/doctype/kanban_board/kanban_board.py +++ b/frappe/desk/doctype/kanban_board/kanban_board.py @@ -137,7 +137,8 @@ def quick_kanban_board(doctype, board_name, field_name, project=None): 'label': 'Kanban Column', 'fieldname': 'kanban_column', 'fieldtype': 'Select', - 'hidden': 1 + 'hidden': 1, + 'owner': 'Administrator' }) meta = frappe.get_meta(doctype) diff --git a/frappe/workflow/doctype/workflow/workflow.py b/frappe/workflow/doctype/workflow/workflow.py index 64b12dad31..e5458d35e8 100644 --- a/frappe/workflow/doctype/workflow/workflow.py +++ b/frappe/workflow/doctype/workflow/workflow.py @@ -35,6 +35,7 @@ class Workflow(Document): "no_copy": 1, "fieldtype": "Link", "options": "Workflow State", + "owner": "Administrator" }).save() frappe.msgprint(_("Created Custom Field {0} in {1}").format(self.workflow_state_field, @@ -81,4 +82,4 @@ class Workflow(Document): @frappe.whitelist() def get_fieldnames_for(doctype): return [f.fieldname for f in frappe.get_meta(doctype).fields \ - if f.fieldname not in no_value_fields] \ No newline at end of file + if f.fieldname not in no_value_fields] From 8d5ee593a5aa9e2ca55401eff09813fb15698966 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 11 Dec 2018 16:27:37 +0530 Subject: [PATCH 13/20] [router] clarify show desk for no route --- frappe/public/js/frappe/router.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 9ad05edc34..e79080cb3b 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -51,12 +51,12 @@ frappe.route = function() { frappe.view_factory[title_cased_route].show(); } else { // show page - frappe.views.pageview.show(route[0]); + const route_name = frappe.utils.xss_sanitise(route[0]); + frappe.views.pageview.show(route_name); } } else { - // show page - const route_name = frappe.utils.xss_sanitise(route[0]); - frappe.views.pageview.show(route_name); + // Show desk + frappe.views.pageview.show(''); } From 25f2bb0afd9deaac43581443e2cb915e62c5d97d Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 11 Dec 2018 16:29:49 +0530 Subject: [PATCH 14/20] [setup] remove execution time --- frappe/desk/page/setup_wizard/setup_wizard.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py index 3860645f2a..61bcba8e6f 100755 --- a/frappe/desk/page/setup_wizard/setup_wizard.py +++ b/frappe/desk/page/setup_wizard/setup_wizard.py @@ -379,10 +379,10 @@ def make_records(records, debug=False): doc.insert(ignore_permissions=True) - exec_time_str = "" - if debug: - time_end = time() - exec_time_str = ": {0} sec".format(round(time_end - time_start, 2)) + # exec_time_str = "" + # if debug: + # time_end = time() + # exec_time_str = ": {0} sec".format(round(time_end - time_start, 2)) # print("Inserted {0} {1}".format(doctype, doc.name) + exec_time_str) @@ -412,7 +412,7 @@ def make_records(records, debug=False): finally: root_time_end = time() total_time = round(root_time_end - root_time_start, 2) - print("Completion: {0} sec".format(total_time)) + # print("Completion: {0} sec".format(total_time)) def show_document_insert_error(): print("Document Insert Error") From 61f762d0acbaca5cb2466347d1ff640fb45f5ccc Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 11 Dec 2018 20:32:15 +0530 Subject: [PATCH 15/20] [setup] remove debug --- frappe/desk/page/setup_wizard/setup_wizard.py | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py index 61bcba8e6f..0e529dfab4 100755 --- a/frappe/desk/page/setup_wizard/setup_wizard.py +++ b/frappe/desk/page/setup_wizard/setup_wizard.py @@ -352,9 +352,9 @@ def enable_twofactor_all_roles(): def make_records(records, debug=False): from frappe import _dict from frappe.modules import scrub - from time import time - root_time_start = time() + if debug: + print("make_records: in DEBUG mode") # LOG every success and failure for record in records: @@ -374,18 +374,8 @@ def make_records(records, debug=False): doc.flags.ignore_mandatory = True try: - if debug: - time_start = time() - doc.insert(ignore_permissions=True) - # exec_time_str = "" - # if debug: - # time_end = time() - # exec_time_str = ": {0} sec".format(round(time_end - time_start, 2)) - - # print("Inserted {0} {1}".format(doctype, doc.name) + exec_time_str) - except frappe.DuplicateEntryError as e: # print("Failed to insert duplicate {0} {1}".format(doctype, doc.name)) @@ -397,8 +387,6 @@ def make_records(records, debug=False): raise except Exception as e: - # print("Failed to insert {0} {1}".format(doctype, doc.name)) - exception = record.get('__exception') if exception: config = _dict(exception) @@ -409,10 +397,6 @@ def make_records(records, debug=False): else: show_document_insert_error() - finally: - root_time_end = time() - total_time = round(root_time_end - root_time_start, 2) - # print("Completion: {0} sec".format(total_time)) def show_document_insert_error(): print("Document Insert Error") From 0f5f04b409dd09653b0477f056063ead1208cff7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 12 Dec 2018 14:09:50 +0530 Subject: [PATCH 16/20] fix(tests): one more attempt to fix the erratic test_scheduler.py (#6612) * debug(test_scheduler): please fail * fix(tests): use flags instead of globals since cache is not trhead-safe --- frappe/cache_manager.py | 6 ++++-- frappe/tests/test_scheduler.py | 16 +++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py index f2728122ef..a3864a9d0c 100644 --- a/frappe/cache_manager.py +++ b/frappe/cache_manager.py @@ -17,6 +17,10 @@ def clear_user_cache(user=None): "defaults", "user_permissions", "home_page", "linked_with", "desktop_icons", 'portal_menu_items') + # this will automatically reload the global cache + # so it is important to clear this first + clear_notifications(user) + if user: for name in groups: cache.hdel(name, user) @@ -28,8 +32,6 @@ def clear_user_cache(user=None): clear_defaults_cache() clear_global_cache() - clear_notifications(user) - def clear_global_cache(): from frappe.website.render import clear_cache as clear_website_cache diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index 6c72a49d61..a10e911b04 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -3,14 +3,14 @@ from __future__ import unicode_literals from unittest import TestCase from dateutil.relativedelta import relativedelta from frappe.utils.scheduler import (enqueue_applicable_events, restrict_scheduler_events_if_dormant, - get_enabled_scheduler_events, disable_scheduler_on_expiry) + get_enabled_scheduler_events, disable_scheduler_on_expiry) from frappe import _dict from frappe.utils.background_jobs import enqueue from frappe.utils import now_datetime, today, add_days, add_to_date from frappe.limits import update_limits, clear_limit import frappe -import json, time +import time def test_timeout(): '''This function needs to be pickleable''' @@ -49,12 +49,12 @@ class TestScheduler(TestCase): frappe.flags.enabled_events = None def test_enabled_events_day_change(self): - val = json.dumps(["daily", "daily_long", "weekly", "weekly_long", - "monthly", "monthly_long"]) - frappe.db.set_global('enabled_scheduler_events', val) - # TEMP for debug: this test fails randomly - print('Setting enabled_scheduler_events {0}'.format(val)) + # use flags instead of globals as this test fails intermittently + # the root cause has not been identified but the culprit seems cache + # since cache is mutable, it maybe be changed by a parallel process + frappe.flags.enabled_events = ["daily", "daily_long", "weekly", "weekly_long", + "monthly", "monthly_long"] # maintain last_event and next_event on different days next_event = now_datetime().replace(hour=0, minute=0, second=0, microsecond=0) @@ -65,6 +65,8 @@ class TestScheduler(TestCase): self.assertTrue("all" in frappe.flags.ran_schedulers) self.assertFalse("hourly" in frappe.flags.ran_schedulers) + frappe.flags.enabled_events = None + def test_restrict_scheduler_events(self): frappe.set_user("Administrator") From 36364fa54d94d5130f68b55d46e3f6427ce506f1 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 12 Dec 2018 14:10:23 +0530 Subject: [PATCH 17/20] fix(ui): make footer appear at end of page (#6610) --- frappe/public/less/website.less | 15 +++++++++++++++ frappe/templates/base.html | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/frappe/public/less/website.less b/frappe/public/less/website.less index 555f7ab33c..1985a09d09 100644 --- a/frappe/public/less/website.less +++ b/frappe/public/less/website.less @@ -3,11 +3,26 @@ @import "avatar.less"; @import "indicator.less"; +html, body { + height: 100%; + margin: 0; padding: 0; /* to avoid scrollbars */ +} + body { font-family: @font-stack; color: @text-color; } +.main-section { + display: flex; + min-height: 100%; + flex-direction: column; +} + +.wrapper { + flex: 1; +} + a& { color: @text-color; diff --git a/frappe/templates/base.html b/frappe/templates/base.html index c47caf6d6f..5e8f3b3396 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -37,7 +37,7 @@ {% block body %}
    -
    +
    {%- block banner -%} {% include "templates/includes/banner_extension.html" ignore missing %} From 5693080940aa643ec0a85689ada08a7e5704dc10 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 12 Dec 2018 14:11:23 +0530 Subject: [PATCH 18/20] [UX] Report builder (#6608) * fix: Remove fixed height check * fix(sort-selector): Set sort arrow correctly on load * fix(query-report): Simplify help message * fix(report-builder): Set dirty state when report settings are changed - Also save the page_length when saving the report --- frappe/public/js/frappe/ui/sort_selector.html | 2 +- .../js/frappe/views/reports/query_report.js | 8 +- .../js/frappe/views/reports/report_view.js | 102 +++++++++++------- 3 files changed, 65 insertions(+), 47 deletions(-) diff --git a/frappe/public/js/frappe/ui/sort_selector.html b/frappe/public/js/frappe/ui/sort_selector.html index 2452c40d5e..ab41953e68 100644 --- a/frappe/public/js/frappe/ui/sort_selector.html +++ b/frappe/public/js/frappe/ui/sort_selector.html @@ -17,7 +17,7 @@
    \ No newline at end of file diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 2fc0c25a21..26f346618a 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -952,12 +952,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } show_tip() { - const part1 = __('For comparative filters, start with ">" or "<" or "=", e.g. >5 or =324'); - const part2 = __('For ranges use ":", e.g. "5:10" (to filter values between 5 & 10'); - this.page.footer.removeClass('hide').addClass('text-muted text-center').html(` -

    ${part1}

    -

    ${part2}

    - `); + const message = __('For comparison, use >5, <10 or =324. For ranges, use 5:10 (for values between 5 & 10).'); + this.page.footer.removeClass('hide').addClass('text-muted text-center').html(`

    ${message}

    `); } message_div(message) { diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 67f4180965..0834bf4478 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -32,6 +32,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { this.order_by = this.report_doc.json.order_by; this.add_totals_row = this.report_doc.json.add_totals_row; this.page_title = this.report_name; + this.page_length = this.report_doc.json.page_length || 20; + this.order_by = this.report_doc.json.order_by || 'modified desc'; }); } } @@ -39,7 +41,6 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { setup_view() { this.setup_columns(); this.bind_charts_button(); - this.setup_dynamic_row_height_check(); } setup_result_area() { @@ -50,8 +51,53 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { this.$result.append(this.$datatable_wrapper); } + setup_paging_area() { + super.setup_paging_area(); + const message = __('For comparison, use >5, <10 or =324. For ranges, use 5:10 (for values between 5 & 10).'); + this.$paging_area.find('.level-left').append( + `

    ${message}

    ` + ) + } + + setup_sort_selector() { + this.sort_selector = new frappe.ui.SortSelector({ + parent: this.filter_area.$filter_list_wrapper, + doctype: this.doctype, + args: this.order_by, + onchange: this.on_sort_change.bind(this) + }); + } + before_render() { - this.save_report_settings(); + if (this.report_doc) { + this.set_dirty_state_for_custom_report(); + } else { + this.save_report_settings(); + } + } + + set_dirty_state_for_custom_report() { + const json = JSON.stringify({ + filters: this.filter_area.get(), + fields: this.fields, + order_by: this.sort_selector.get_sql_string(), + add_totals_row: this.add_totals_row, + page_length: this.page_length + }); + + const report_json = JSON.stringify({ + filters: this.report_doc.json.filters, + fields: this.report_doc.json.fields, + order_by: this.report_doc.json.order_by, + add_totals_row: this.report_doc.json.add_totals_row, + page_length: this.report_doc.json.page_length + }); + + if (json != report_json) { + this.page.set_indicator(__('Not Saved'), 'orange'); + } else { + this.page.clear_indicator(); + } } save_report_settings() { @@ -121,16 +167,6 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { } } - on_filter_change() { - if (this.report_doc) { - if (JSON.stringify(this.filters) !== JSON.stringify(this.filter_area.get())) { - this.page.set_indicator(__('Not Saved'), 'orange'); - } else { - this.page.clear_indicator(); - } - } - } - update_row(doc, flash_row) { const to_refresh = []; @@ -178,8 +214,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { columns: this.columns, data: this.get_data(values), getEditor: this.get_editing_object.bind(this), - dynamicRowHeight: !this.fixed_row_height.get_value(), checkboxColumn: true, + inlineFilters: true, cellHeight: 37, events: { onRemoveColumn: (column) => { @@ -534,7 +570,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { set_fields() { if (this.report_name && this.report_doc.json.fields) { - this.fields = this.report_doc.json.fields; + this.fields = this.report_doc.json.fields.slice(); return; } else if (this.view_user_settings.fields) { // get from user_settings @@ -857,23 +893,6 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { }); } - setup_dynamic_row_height_check() { - this.fixed_row_height = frappe.ui.form.make_control({ - df: { - fieldtype: 'Check', - fieldname: 'fixed_row_height', - label: __('Fixed height'), - onchange: () => { - this.render(true); - } - }, - parent: this.$paging_area.find('.level-left'), - render_input: true - }); - this.fixed_row_height.$wrapper.addClass('report-action-checkbox'); - this.fixed_row_height.set_value(1); - } - get_checked_items(only_docnames) { const indexes = this.datatable.rowmanager.getCheckedRows(); const items = indexes.filter(i => i != undefined) @@ -889,17 +908,20 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { save_report(save_type) { const _save_report = (name) => { // callback + const report_settings = { + filters: this.filter_area.get(), + fields: this.fields, + order_by: this.sort_selector.get_sql_string(), + add_totals_row: this.add_totals_row, + page_length: this.page_length + } + return frappe.call({ method: 'frappe.desk.reportview.save_report', args: { name: name, doctype: this.doctype, - json: JSON.stringify({ - filters: this.filter_area.get(), - fields: this.fields, - order_by: this.sort_selector.get_sql_string(), - add_totals_row: this.add_totals_row - }) + json: JSON.stringify(report_settings) }, callback:(r) => { if(r.exc) { @@ -910,9 +932,9 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { frappe.set_route('List', this.doctype, 'Report', r.message); } - // reset dirty state - this.filters = this.filter_area.get(); - this.on_filter_change(); + // update state + this.report_doc.json = report_settings; + this.set_dirty_state_for_custom_report(); } }); From a23bd34e10a2840745253c0a8327f765efdf542c Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 12 Dec 2018 15:43:25 +0530 Subject: [PATCH 19/20] fix(report-view): Update Reports dropdown on creation of a Report (#6604) This is done by updating frappe.boot.user.all_reports on creation of Report Also to ensure that reports are properly ordered, report list is explicitly sorted by name --- frappe/public/js/frappe/list/list_sidebar.js | 5 ++++- frappe/public/js/frappe/views/reports/report_view.js | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js index ba03fd18de..d679a085cd 100644 --- a/frappe/public/js/frappe/list/list_sidebar.js +++ b/frappe/public/js/frappe/list/list_sidebar.js @@ -125,8 +125,11 @@ frappe.views.ListSidebar = class ListSidebar { add_reports(this.list_view.settings.reports); } + // Sort reports alphabetically + var reports = Object.values(frappe.boot.user.all_reports).sort((a,b) => a.title.localeCompare(b.title)) || []; + // from specially tagged reports - add_reports(frappe.boot.user.all_reports || []); + add_reports(reports); } setup_list_filter() { diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 0834bf4478..77e691191a 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -929,6 +929,14 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { return; } if(r.message != this.report_name) { + // Rerender the reports dropdown, + // so that this report is included in the dropdown as well. + frappe.boot.user.all_reports[r.message] = { + ref_doctype: "Item", + report_type: "Report Builder", + title: r.message, + }; + this.list_sidebar.setup_reports(); frappe.set_route('List', this.doctype, 'Report', r.message); } From f42c5a83dab033f1e1151c2d6cfa5b43500f0705 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 13 Dec 2018 11:02:39 +0600 Subject: [PATCH 20/20] bumped to version 11.0.3-beta.37 --- frappe/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index e366470803..dd4bdc6c91 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe" app_license = "MIT" develop_version = '12.x.x-develop' -staging_version = '11.0.3-beta.36' +staging_version = '11.0.3-beta.37' app_email = "info@frappe.io"