From 759f76f9cdeb968b9fc33199eefad2a7bad1e6f2 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 01:08:45 +0530 Subject: [PATCH] fix: show cards created by user --- frappe/desk/doctype/number_card/number_card.py | 6 +++++- frappe/public/js/frappe/widgets/widget_dialog.js | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py index 509995392c..14d7aeea3d 100644 --- a/frappe/desk/doctype/number_card/number_card.py +++ b/frappe/desk/doctype/number_card/number_card.py @@ -45,4 +45,8 @@ def create_number_card(args): doc.is_standard = 1 doc.update(args) doc.insert(ignore_permissions=True) - return doc \ No newline at end of file + return doc + +def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters): + or_filters = {'creation': frappe.session.user, 'is_standard': 1} + return frappe.db.get_list('Number Card', fields=['name', 'label'], or_filters=or_filters, as_list = 1) \ No newline at end of file diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index 7fff6c897a..d729012a3b 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -277,9 +277,9 @@ class NumberCardDialog extends WidgetDialog { options: 'Number Card', get_query: () => { return { + 'query': 'frappe.desk.doctype.number_card.number_card.get_cards_for_user', filters: { - document_type: this.document_type, - is_standard: 1 + document_type: this.document_type, } }; }, @@ -360,16 +360,16 @@ class NumberCardDialog extends WidgetDialog { if (this.default_values['doctype']) { this.document_type = this.default_values['doctype']; this.setup_filter(this.default_values['doctype']); - this.set_aggregate_function_fields(this.dialog.get_values()); + this.set_aggregate_function_fields(); } else { this.show_field('document_type'); } } } - set_aggregate_function_fields(values) { + set_aggregate_function_fields() { let aggregate_function_fields = []; - if (values.function !== 'Count' && this.document_type) { + if (this.document_type) { frappe.get_meta(this.document_type).fields.map(df => { if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) { aggregate_function_fields.push({label: df.label, value: df.fieldname});