+
`);
this.inner_toolbar.find('.inner-page-message').remove();
diff --git a/frappe/public/js/frappe/utils/number_format.js b/frappe/public/js/frappe/utils/number_format.js
index 1c39f42ec5..32e3669caf 100644
--- a/frappe/public/js/frappe/utils/number_format.js
+++ b/frappe/public/js/frappe/utils/number_format.js
@@ -8,7 +8,12 @@ if (!window.frappe) window.frappe = {};
function flt(v, decimals, number_format) {
if (v == null || v == '') return 0;
- if (typeof v !== "number") {
+ if (!(typeof v === "number" || String(parseFloat(v)) == v)) {
+ // cases in which this block should not run
+ // 1. 'v' is already a number
+ // 2. v is already parsed but in string form
+ // if (typeof v !== "number") {
+
v = v + "";
// strip currency symbol if exists
@@ -25,6 +30,7 @@ function flt(v, decimals, number_format) {
v = 0;
}
+ v = parseFloat(v);
if (decimals != null)
return _round(v, decimals);
return v;
diff --git a/frappe/public/js/frappe/views/file/file_view.js b/frappe/public/js/frappe/views/file/file_view.js
index e020bff4dd..11204bb660 100644
--- a/frappe/public/js/frappe/views/file/file_view.js
+++ b/frappe/public/js/frappe/views/file/file_view.js
@@ -380,8 +380,10 @@ frappe.views.FileView = class FileView extends frappe.views.ListView {
return `
${frappe.utils.icon(item.icon, item.icon_size || 'md')}
`);
diff --git a/frappe/public/js/frappe/form/footer/form_timeline.js b/frappe/public/js/frappe/form/footer/form_timeline.js
index 115a62e098..b3feae3ee8 100644
--- a/frappe/public/js/frappe/form/footer/form_timeline.js
+++ b/frappe/public/js/frappe/form/footer/form_timeline.js
@@ -136,6 +136,7 @@ class FormTimeline extends BaseTimeline {
this.timeline_items.push(...this.get_energy_point_timeline_contents());
this.timeline_items.push(...this.get_version_timeline_contents());
this.timeline_items.push(...this.get_share_timeline_contents());
+ this.timeline_items.push(...this.get_workflow_timeline_contents());
this.timeline_items.push(...this.get_like_timeline_contents());
this.timeline_items.push(...this.get_custom_timeline_contents());
this.timeline_items.push(...this.get_assignment_timeline_contents());
@@ -146,7 +147,9 @@ class FormTimeline extends BaseTimeline {
}
get_user_link(user) {
- const user_display_text = (frappe.user_info(user).fullname || '').bold();
+ const user_display_text = (
+ (frappe.session.user == user ? __("You") : frappe.user_info(user).fullname) || ''
+ ).bold();
return frappe.utils.get_form_link('User', user, true, user_display_text);
}
@@ -339,11 +342,26 @@ class FormTimeline extends BaseTimeline {
icon_size: 'sm',
creation: like_log.creation,
content: __('{0} Liked', [this.get_user_link(like_log.owner)]),
+ title: "Like",
});
});
return like_timeline_contents;
}
+ get_workflow_timeline_contents() {
+ let workflow_timeline_contents = [];
+ (this.doc_info.workflow_logs || []).forEach(workflow_log => {
+ workflow_timeline_contents.push({
+ icon: 'branch',
+ icon_size: 'sm',
+ creation: workflow_log.creation,
+ content: `${this.get_user_link(workflow_log.owner)} ${__(workflow_log.content)}`,
+ title: "Workflow",
+ });
+ });
+ return workflow_timeline_contents;
+ }
+
get_custom_timeline_contents() {
let custom_timeline_contents = [];
(this.doc_info.additional_timeline_content || []).forEach(custom_item => {
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index cef3d831d2..d8437f6e10 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1165,6 +1165,10 @@ frappe.ui.form.Form = class FrappeForm {
return btn;
}
+ change_custom_button_type(label, group, type) {
+ this.page.change_inner_button_type(label, group, type);
+ }
+
clear_custom_buttons() {
this.page.clear_inner_toolbar();
this.page.clear_user_actions();
diff --git a/frappe/public/js/frappe/form/grid_row_form.js b/frappe/public/js/frappe/form/grid_row_form.js
index 73131a00ae..31295899b5 100644
--- a/frappe/public/js/frappe/form/grid_row_form.js
+++ b/frappe/public/js/frappe/form/grid_row_form.js
@@ -123,10 +123,12 @@ export default class GridRowForm {
.toggle(this.row.grid.is_editable());
}
refresh_field(fieldname) {
- if(this.fields_dict[fieldname]) {
- this.fields_dict[fieldname].refresh();
- this.layout && this.layout.refresh_dependency();
- }
+ const field = this.fields_dict[fieldname];
+ if (!field) return;
+
+ field.docname = this.row.doc.name;
+ field.refresh();
+ this.layout && this.layout.refresh_dependency();
}
set_focus() {
// wait for animation and then focus on the first row
diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index dd96b57fb5..ba522a4085 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -2,86 +2,191 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
constructor(opts) {
/* Options: doctype, target, setters, get_query, action, add_filters_group, data_fields, primary_action_label */
Object.assign(this, opts);
- var me = this;
- if (this.doctype != "[Select]") {
- frappe.model.with_doctype(this.doctype, function () {
- me.make();
- });
+ this.for_select = this.doctype == "[Select]";
+ if (!this.for_select) {
+ frappe.model.with_doctype(this.doctype, () => this.init());
} else {
- this.make();
+ this.init();
}
}
- make() {
- let me = this;
+ init() {
this.page_length = 20;
this.start = 0;
- let fields = this.get_primary_filters();
+ this.fields = this.get_fields();
- // Make results area
- fields = fields.concat([
- { fieldtype: "HTML", fieldname: "results_area" },
+ this.make();
+ }
+
+ get_fields() {
+ const primary_fields = this.get_primary_filters();
+ const result_fields = this.get_result_fields();
+ const data_fields = this.get_data_fields();
+ const child_selection_fields = this.get_child_selection_fields();
+
+ return [...primary_fields, ...result_fields, ...data_fields, ...child_selection_fields];
+ }
+
+ get_result_fields() {
+ const show_next_page = () => {
+ this.start += 20;
+ this.get_results();
+ };
+ return [
{
- fieldtype: "Button", fieldname: "more_btn", label: __("More"),
- click: () => {
- this.start += 20;
- this.get_results();
- }
+ fieldtype: "HTML", fieldname: "results_area"
+ },
+ {
+ fieldtype: "Button", fieldname: "more_btn",
+ label: __("More"), click: show_next_page.bind(this)
}
- ]);
+ ];
+ }
- // Custom Data Fields
- if (this.data_fields) {
- fields.push({ fieldtype: "Section Break" });
- fields = fields.concat(this.data_fields);
+ get_data_fields() {
+ if (this.data_fields && this.data_fields.length) {
+ // Custom Data Fields
+ return [
+ { fieldtype: "Section Break" },
+ ...this.data_fields
+ ];
+ } else {
+ return [];
}
+ }
+ get_child_selection_fields() {
+ const fields = [];
+ if (this.allow_child_item_selection && this.child_fieldname) {
+ fields.push({ fieldtype: "HTML", fieldname: "child_selection_area" });
+ }
+ return fields;
+ }
+
+ make() {
let doctype_plural = this.doctype.plural();
+ let title = __("Select {0}", [this.for_select ? __("value") : __(doctype_plural)]);
this.dialog = new frappe.ui.Dialog({
- title: __("Select {0}", [(this.doctype == '[Select]') ? __("value") : __(doctype_plural)]),
- fields: fields,
+ title: title,
+ fields: this.fields,
primary_action_label: this.primary_action_label || __("Get Items"),
- secondary_action_label: __("Make {0}", [__(me.doctype)]),
- primary_action: function () {
- let filters_data = me.get_custom_filters();
- me.action(me.get_checked_values(), cur_dialog.get_values(), me.args, filters_data);
+ secondary_action_label: __("Make {0}", [__(this.doctype)]),
+ primary_action: () => {
+ let filters_data = this.get_custom_filters();
+ const data_values = cur_dialog.get_values(); // to pass values of data fields
+ const filtered_children = this.get_selected_child_names();
+ const selected_documents = [...this.get_checked_values(), ...this.get_parent_name_of_selected_children()];
+ this.action(selected_documents, {
+ ...this.args,
+ ...data_values,
+ ...filters_data,
+ filtered_children
+ });
},
- secondary_action: function (e) {
- // If user wants to close the modal
- if (e) {
- frappe.route_options = {};
- if (Array.isArray(me.setters)) {
- for (let df of me.setters) {
- frappe.route_options[df.fieldname] = me.dialog.fields_dict[df.fieldname].get_value() || undefined;
- }
- } else {
- Object.keys(me.setters).forEach(function (setter) {
- frappe.route_options[setter] = me.dialog.fields_dict[setter].get_value() || undefined;
- });
- }
-
- frappe.new_doc(me.doctype, true);
- }
- }
+ secondary_action: this.make_new_document.bind(this)
});
if (this.add_filters_group) {
this.make_filter_area();
}
+ this.args = {};
+
+ this.setup_results();
+ this.bind_events();
+ this.get_results();
+ this.dialog.show();
+ }
+
+ make_new_document(e) {
+ // If user wants to close the modal
+ if (e) {
+ this.set_route_options();
+ frappe.new_doc(this.doctype, true);
+ }
+ }
+
+ set_route_options() {
+ // set route options to get pre-filled form fields
+ frappe.route_options = {};
+ if (Array.isArray(this.setters)) {
+ for (let df of this.setters) {
+ frappe.route_options[df.fieldname] = this.dialog.fields_dict[df.fieldname].get_value() || undefined;
+ }
+ } else {
+ Object.keys(this.setters).forEach(setter => {
+ frappe.route_options[setter] = this.dialog.fields_dict[setter].get_value() || undefined;
+ });
+ }
+ }
+
+ setup_results() {
this.$parent = $(this.dialog.body);
- this.$wrapper = this.dialog.fields_dict.results_area.$wrapper.append(``);
this.$results = this.$wrapper.find('.results');
this.$results.append(this.make_list_row());
+ }
- this.args = {};
+ toggle_child_selection() {
+ if (this.dialog.fields_dict['allow_child_item_selection'].get_value()) {
+ this.get_child_result().then(r => {
+ this.child_results = r.message || [];
+ this.render_child_datatable();
+
+ this.$wrapper.addClass('hidden');
+ this.$child_wrapper.removeClass('hidden');
+ this.dialog.fields_dict.more_btn.$wrapper.hide();
+ });
+ } else {
+ this.child_results = [];
+ this.get_results();
+ this.$wrapper.removeClass('hidden');
+ this.$child_wrapper.addClass('hidden');
+ }
+ }
- this.bind_events();
- this.get_results();
- this.dialog.show();
+ render_child_datatable() {
+ if (!this.child_datatable) {
+ this.setup_child_datatable();
+ } else {
+ setTimeout(() => {
+ this.child_datatable.rowmanager.checkMap = [];
+ this.child_datatable.refresh(this.get_child_datatable_rows());
+ this.$child_wrapper.find('.dt-scrollable').css('height', '300px');
+ }, 500);
+ }
+ }
+
+ get_child_datatable_columns() {
+ const parent = this.doctype;
+ return [parent, ...this.child_columns].map(d => ({ name: frappe.unscrub(d), editable: false }));
+ }
+
+ get_child_datatable_rows() {
+ return this.child_results.map(d => Object.values(d).slice(1)); // slice name field
+ }
+
+ setup_child_datatable() {
+ const header_columns = this.get_child_datatable_columns();
+ const rows = this.get_child_datatable_rows();
+ this.$child_wrapper = this.dialog.fields_dict.child_selection_area.$wrapper;
+ this.$child_wrapper.addClass('mt-3');
+
+ this.child_datatable = new frappe.DataTable(this.$child_wrapper.get(0), {
+ columns: header_columns,
+ data: rows,
+ layout: 'fluid',
+ inlineFilters: true,
+ serialNoColumn: false,
+ checkboxColumn: true,
+ cellHeight: 35,
+ noDataMessage: __('No Data'),
+ disableReorderColumn: true
+ });
+ this.$child_wrapper.find('.dt-scrollable').css('height', '300px');
}
get_primary_filters() {
@@ -94,7 +199,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
columns[0] = [
{
fieldtype: "Data",
- label: __("Search"),
+ label: __("Name"),
fieldname: "search_term"
}
];
@@ -127,6 +232,16 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
// now a is a fixed-size array with mutable entries
}
+ if (this.allow_child_item_selection) {
+ this.child_doctype = frappe.meta.get_docfield(this.doctype, this.child_fieldname).options;
+ columns[0].push({
+ fieldtype: "Check",
+ label: __("Select {0}", [this.child_doctype]),
+ fieldname: "allow_child_item_selection",
+ onchange: this.toggle_child_selection.bind(this)
+ });
+ }
+
fields = [
...columns[0],
{ fieldtype: "Column Break" },
@@ -156,6 +271,9 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
this.get_results();
}
});
+ // 'Apply Filter' breaks since the filers are not in a popover
+ // Hence keeping it hidden
+ this.filter_group.wrapper.find('.apply-filters').hide();
}
get_custom_filters() {
@@ -166,7 +284,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
});
}, {});
} else {
- return [];
+ return {};
}
}
@@ -200,6 +318,34 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
});
}
+ get_parent_name_of_selected_children() {
+ if (!this.child_datatable || !this.child_datatable.datamanager.rows.length) return [];
+
+ let parent_names = this.child_datatable.rowmanager.checkMap.reduce((parent_names, checked, index) => {
+ if (checked == 1) {
+ const parent_name = this.child_results[index].parent;
+ parent_names.push(parent_name);
+ }
+ return parent_names;
+ }, []);
+
+ return parent_names;
+ }
+
+ get_selected_child_names() {
+ if (!this.child_datatable || !this.child_datatable.datamanager.rows.length) return [];
+
+ let checked_names = this.child_datatable.rowmanager.checkMap.reduce((checked_names, checked, index) => {
+ if (checked == 1) {
+ const child_row_name = this.child_results[index].name;
+ checked_names.push(child_row_name);
+ }
+ return checked_names;
+ }, []);
+
+ return checked_names;
+ }
+
get_checked_values() {
// Return name of checked value.
return this.$results.find('.list-item-container').map(function () {
@@ -276,6 +422,8 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
me.$results.append(me.make_list_row(result));
});
+ this.$results.find(".list-item--head").css("z-index", 0);
+
if (frappe.flags.auto_scroll) {
this.$results.animate({ scrollTop: me.$results.prop('scrollHeight') }, 500);
}
@@ -297,7 +445,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
this.render_result_list(checked, 0, false);
}
- get_results() {
+ get_filters_from_setters() {
let me = this;
let filters = this.get_query ? this.get_query().filters : {} || {};
let filter_fields = [];
@@ -321,12 +469,18 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
});
}
- let filter_group = this.get_custom_filters();
- Object.assign(filters, filter_group);
+ return [filters, filter_fields];
+ }
- let args = {
- doctype: me.doctype,
- txt: me.dialog.fields_dict["search_term"].get_value(),
+ get_args_for_search() {
+ let [filters, filter_fields] = this.get_filters_from_setters();
+
+ let custom_filters = this.get_custom_filters();
+ Object.assign(filters, custom_filters);
+
+ return {
+ doctype: this.doctype,
+ txt: this.dialog.fields_dict["search_term"].get_value(),
filters: filters,
filter_fields: filter_fields,
start: this.start,
@@ -334,25 +488,81 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
query: this.get_query ? this.get_query().query : '',
as_dict: 1
};
- frappe.call({
+ }
+
+ async perform_search(args) {
+ const res = await frappe.call({
type: "GET",
method: 'frappe.desk.search.search_widget',
no_spinner: true,
args: args,
- callback: function (r) {
- let more = 0;
- me.results = [];
- if (r.values.length) {
- if (r.values.length > me.page_length) {
- r.values.pop();
- more = 1;
- }
- r.values.forEach(function (result) {
- result.checked = 0;
- me.results.push(result);
- });
+ });
+ const more = res.values.length && res.values.length > this.page_length ? 1 : 0;
+ if (more) {
+ res.values.pop();
+ }
+
+ return [res, more];
+ }
+
+ async get_results() {
+ const args = this.get_args_for_search();
+ const [res, more] = await this.perform_search(args);
+
+ this.results = [];
+ if (res.values.length) {
+ res.values.forEach(result => {
+ result.checked = 0;
+ this.results.push(result);
+ });
+ }
+ this.render_result_list(this.results, more);
+ }
+
+ async get_filtered_parents_for_child_search() {
+ const parent_search_args = this.get_args_for_search();
+ parent_search_args.filter_fields = ['name'];
+ // eslint-disable-next-line no-unused-vars
+ const [response, _] = await this.perform_search(parent_search_args);
+
+ let parent_names = [];
+ if (response.values.length) {
+ parent_names = response.values.map(v => v.name);
+ }
+ return parent_names;
+ }
+
+ async add_parent_filters(filters) {
+ const parent_names = await this.get_filtered_parents_for_child_search();
+ if (parent_names.length) {
+ filters.push([ "parent", "in", parent_names ]);
+ }
+ }
+
+ add_custom_child_filters(filters) {
+ if (this.add_filters_group && this.filter_group) {
+ this.filter_group.get_filters().forEach(filter => {
+ if (filter[0] == this.child_doctype) {
+ filters.push([filter[1], filter[2], filter[3]]);
}
- me.render_result_list(me.results, more);
+ });
+ }
+ }
+
+ async get_child_result() {
+ let filters = [["parentfield", "=", this.child_fieldname]];
+
+ await this.add_parent_filters(filters);
+ this.add_custom_child_filters(filters);
+
+ return frappe.call({
+ method: "frappe.client.get_list",
+ args: {
+ doctype: this.child_doctype,
+ filters: filters,
+ fields: ['name', 'parent', ...this.child_columns],
+ parent: this.doctype,
+ order_by: 'parent'
}
});
}
diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index beacb136e6..7af2cb2007 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -6,7 +6,11 @@ frappe.views.BaseList = class BaseList {
}
show() {
- frappe.run_serially([
+ return frappe.run_serially([
+ () => this.show_skeleton(),
+ () => this.fetch_meta(),
+ () => this.hide_skeleton(),
+ () => this.check_permissions(),
() => this.init(),
() => this.before_refresh(),
() => this.refresh(),
@@ -150,6 +154,22 @@ frappe.views.BaseList = class BaseList {
}
}
+ fetch_meta() {
+ return frappe.model.with_doctype(this.doctype);
+ }
+
+ show_skeleton() {
+
+ }
+
+ hide_skeleton() {
+
+ }
+
+ check_permissions() {
+ return true;
+ }
+
setup_page() {
this.page = this.parent.page;
this.$page = $(this.parent);
diff --git a/frappe/public/js/frappe/list/bulk_operations.js b/frappe/public/js/frappe/list/bulk_operations.js
index 3b99560411..931f2cf587 100644
--- a/frappe/public/js/frappe/list/bulk_operations.js
+++ b/frappe/public/js/frappe/list/bulk_operations.js
@@ -4,7 +4,7 @@ export default class BulkOperations {
this.doctype = doctype;
}
- print(docs) {
+ print (docs) {
const print_settings = frappe.model.get_doc(':Print Settings', 'Print Settings');
const allow_print_for_draft = cint(print_settings.allow_print_for_draft);
const is_submittable = frappe.model.is_submittable(this.doctype);
@@ -27,31 +27,38 @@ export default class BulkOperations {
if (valid_docs.length > 0) {
const dialog = new frappe.ui.Dialog({
title: __('Print Documents'),
- fields: [{
- 'fieldtype': 'Check',
- 'label': __('With Letterhead'),
- 'fieldname': 'with_letterhead'
- },
- {
- 'fieldtype': 'Select',
- 'label': __('Print Format'),
- 'fieldname': 'print_sel',
- options: frappe.meta.get_print_formats(this.doctype)
- }]
+ fields: [
+ {
+ 'fieldtype': 'Select',
+ 'label': __('Letter Head'),
+ 'fieldname': 'letter_sel',
+ 'default': __('No Letterhead'),
+ options: this.get_letterhead_options()
+ },
+ {
+ 'fieldtype': 'Select',
+ 'label': __('Print Format'),
+ 'fieldname': 'print_sel',
+ options: frappe.meta.get_print_formats(this.doctype)
+ }
+ ]
});
dialog.set_primary_action(__('Print'), args => {
if (!args) return;
const default_print_format = frappe.get_meta(this.doctype).default_print_format;
- const with_letterhead = args.with_letterhead ? 1 : 0;
+ const with_letterhead = args.letter_sel == __("No Letterhead") ? 0 : 1;
const print_format = args.print_sel ? args.print_sel : default_print_format;
const json_string = JSON.stringify(valid_docs);
-
+ const letterhead = args.letter_sel;
const w = window.open('/api/method/frappe.utils.print_format.download_multi_pdf?' +
'doctype=' + encodeURIComponent(this.doctype) +
'&name=' + encodeURIComponent(json_string) +
'&format=' + encodeURIComponent(print_format) +
- '&no_letterhead=' + (with_letterhead ? '0' : '1'));
+ '&no_letterhead=' + (with_letterhead ? '0' : '1') +
+ '&letterhead=' + encodeURIComponent(letterhead)
+ );
+
if (!w) {
frappe.msgprint(__('Please enable pop-ups'));
return;
@@ -64,7 +71,28 @@ export default class BulkOperations {
}
}
- delete(docnames, done = null) {
+ get_letterhead_options () {
+ const letterhead_options = [__("No Letterhead")];
+ frappe.call({
+ method: "frappe.client.get_list",
+ args: {
+ doctype: 'Letter Head',
+ fields: ['name', 'is_default'],
+ limit: 0
+ },
+ async: false,
+ callback (r) {
+ if (r.message) {
+ r.message.forEach(letterhead => {
+ letterhead_options.push(letterhead.name);
+ });
+ }
+ }
+ });
+ return letterhead_options;
+ }
+
+ delete (docnames, done = null) {
frappe
.call({
method: 'frappe.desk.reportview.delete_items',
@@ -88,7 +116,7 @@ export default class BulkOperations {
});
}
- assign(docnames, done) {
+ assign (docnames, done) {
if (docnames.length > 0) {
const assign_to = new frappe.ui.form.AssignToDialog({
obj: this,
@@ -106,7 +134,7 @@ export default class BulkOperations {
}
}
- apply_assignment_rule(docnames, done) {
+ apply_assignment_rule (docnames, done) {
if (docnames.length > 0) {
frappe.call('frappe.automation.doctype.assignment_rule.assignment_rule.bulk_apply', {
doctype: this.doctype,
@@ -115,7 +143,7 @@ export default class BulkOperations {
}
}
- submit_or_cancel(docnames, action='submit', done=null) {
+ submit_or_cancel (docnames, action = 'submit', done = null) {
action = action.toLowerCase();
frappe
.call({
@@ -140,7 +168,7 @@ export default class BulkOperations {
});
}
- edit(docnames, field_mappings, done) {
+ edit (docnames, field_mappings, done) {
let field_options = Object.keys(field_mappings).sort();
const status_regex = /status/i;
@@ -198,16 +226,16 @@ export default class BulkOperations {
if (default_field) set_value_field(dialog); // to set `Value` df based on default `Field`
- function set_value_field(dialogObj) {
+ function set_value_field (dialogObj) {
const new_df = Object.assign({},
field_mappings[dialogObj.get_value('field')]);
/* if the field label has status in it and
if it has select fieldtype with no default value then
set a default value from the available option. */
- if(new_df.label.match(status_regex) &&
+ if (new_df.label.match(status_regex) &&
new_df.fieldtype === 'Select' && !new_df.default) {
let options = [];
- if(typeof new_df.options==="string") {
+ if (typeof new_df.options === "string") {
options = new_df.options.split("\n");
}
//set second option as default if first option is an empty string
@@ -223,8 +251,7 @@ export default class BulkOperations {
dialog.show();
}
-
- add_tags(docnames, done) {
+ add_tags (docnames, done) {
const dialog = new frappe.ui.Dialog({
title: __('Add Tags'),
fields: [
@@ -233,7 +260,7 @@ export default class BulkOperations {
fieldname: 'tags',
label: __("Tags"),
reqd: true,
- get_data: function(txt) {
+ get_data: function (txt) {
return frappe.db.get_link_options("Tag", txt);
}
},
@@ -262,7 +289,7 @@ export default class BulkOperations {
dialog.show();
}
- export(doctype, docnames) {
+ export (doctype, docnames) {
frappe.require('data_import_tools.bundle.js', () => {
const data_exporter = new frappe.data_import.DataExporter(doctype, 'Insert New Records');
data_exporter.dialog.set_value('export_records', 'by_filter');
diff --git a/frappe/public/js/frappe/list/list_factory.js b/frappe/public/js/frappe/list/list_factory.js
index b467919d7e..acad85fdcb 100644
--- a/frappe/public/js/frappe/list/list_factory.js
+++ b/frappe/public/js/frappe/list/list_factory.js
@@ -9,35 +9,31 @@ frappe.views.ListFactory = class ListFactory extends frappe.views.Factory {
var me = this;
var doctype = route[1];
- frappe.model.with_doctype(doctype, function () {
- if (locals['DocType'][doctype].issingle) {
- frappe.set_re_route('Form', doctype);
- } else {
- // List / Gantt / Kanban / etc
- // File is a special view
- const view_name = doctype !== 'File' ? frappe.utils.to_title_case(route[2] || 'List') : 'File';
- let view_class = frappe.views[view_name + 'View'];
- if (!view_class) view_class = frappe.views.ListView;
+ // List / Gantt / Kanban / etc
+ // File is a special view
+ const view_name = doctype !== 'File' ? frappe.utils.to_title_case(route[2] || 'List') : 'File';
+ let view_class = frappe.views[view_name + 'View'];
+ if (!view_class) view_class = frappe.views.ListView;
- if (view_class && view_class.load_last_view && view_class.load_last_view()) {
- // view can have custom routing logic
- return;
- }
+ if (view_class && view_class.load_last_view && view_class.load_last_view()) {
+ // view can have custom routing logic
+ return;
+ }
+
+ frappe.provide('frappe.views.list_view.' + doctype);
+ const page_name = frappe.get_route_str();
+
+ if (!frappe.views.list_view[page_name]) {
+ frappe.views.list_view[page_name] = new view_class({
+ doctype: doctype,
+ parent: me.make_page(true, page_name)
+ });
+ } else {
+ frappe.container.change_to(page_name);
+ }
+ me.set_cur_list();
- frappe.provide('frappe.views.list_view.' + doctype);
- const page_name = frappe.get_route_str();
- if (!frappe.views.list_view[page_name]) {
- frappe.views.list_view[page_name] = new view_class({
- doctype: doctype,
- parent: me.make_page(true, page_name)
- });
- } else {
- frappe.container.change_to(page_name);
- }
- me.set_cur_list();
- }
- });
}
show() {
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index c5db7df88c..5f2c4a2a2a 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -33,14 +33,38 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
show() {
this.parent.disable_scroll_to_top = true;
+ super.show();
+ }
+ check_permissions() {
if (!this.has_permissions()) {
frappe.set_route('');
- frappe.msgprint(__("Not permitted to view {0}", [this.doctype]));
- return;
+ frappe.throw(__("Not permitted to view {0}", [this.doctype]));
}
+ }
- super.show();
+ show_skeleton() {
+ this.$list_skeleton = this.parent.page.container.find('.list-skeleton');
+ if (!this.$list_skeleton.length) {
+ this.$list_skeleton = $(`
+
+
+ `);
+ this.parent.page.container.find('.page-content').append(this.$list_skeleton);
+ }
+ this.parent.page.container.find('.layout-main').hide();
+ this.$list_skeleton.show();
+ }
+
+ hide_skeleton() {
+ this.$list_skeleton && this.$list_skeleton.hide();
+ this.parent.page.container.find('.layout-main').show();
}
get view_name() {
@@ -1139,6 +1163,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
if (
$target.hasClass("filterable") ||
$target.hasClass("select-like") ||
+ $target.hasClass("file-select") ||
$target.hasClass("list-row-like") ||
$target.is(":checkbox")
) {
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index f49f282026..b05873d808 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -131,6 +131,7 @@ $.extend(frappe.model, {
with_doctype: function(doctype, callback, async) {
if(locals.DocType[doctype]) {
callback && callback();
+ return Promise.resolve();
} else {
let cached_timestamp = null;
let cached_doc = null;
diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js
index 00336a2137..58175381cf 100644
--- a/frappe/public/js/frappe/ui/dialog.js
+++ b/frappe/public/js/frappe/ui/dialog.js
@@ -153,7 +153,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup {
set_secondary_action(click) {
this.footer.removeClass('hide');
- this.get_secondary_btn().removeClass('hide').on('click', click);
+ this.get_secondary_btn().removeClass('hide').off('click').on('click', click);
}
set_secondary_action_label(label) {
diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 067fed233c..185d275ac3 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -140,7 +140,7 @@ frappe.msgprint = function(msg, title, is_minimizable) {
return;
}
- if(data.alert) {
+ if(data.alert || data.toast) {
frappe.show_alert(data);
return;
}
@@ -361,7 +361,7 @@ frappe.hide_progress = function() {
}
// Floating Message
-frappe.show_alert = function(message, seconds=7, actions={}) {
+frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) {
let indicator_icon_map = {
'orange': "solid-warning",
'yellow': "solid-warning",
diff --git a/frappe/public/js/frappe/ui/page.js b/frappe/public/js/frappe/ui/page.js
index 320227b258..c299edb7db 100644
--- a/frappe/public/js/frappe/ui/page.js
+++ b/frappe/public/js/frappe/ui/page.js
@@ -618,6 +618,23 @@ frappe.ui.Page = class Page {
}
}
+ change_inner_button_type(label, group, type) {
+ let btn;
+
+ if (group) {
+ var $group = this.get_inner_group_button(__(group));
+ if ($group.length) {
+ btn = $group.find(`.dropdown-item[data-label="${encodeURIComponent(label)}"]`);
+ }
+ } else {
+ btn = this.inner_toolbar.find(`button[data-label="${encodeURIComponent(label)}"]`);
+ }
+
+ if (btn) {
+ btn.removeClass().addClass(`btn btn-${type} ellipsis`);
+ }
+ }
+
add_inner_message(message) {
let $message = $(`
+
+
+
+
+
+