vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #12940 from surajshetty3416/fix-grid-docfields

Browse source 
fix: Use grid docfield list while creating grid_row docfield copy
This commit is contained in:
Suraj Shetty 2021-04-21 15:24:07 +05:30 • committed by GitHub
commit 0ab545b2b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/public/js/frappe/form/grid_row.js
View file

@ -6,6 +6,7 @@ export default class GridRow {
this.on_grid_fields = [];
$.extend(this, opts);
if (this.doc && this.parent_df.options) {
frappe.meta.make_docfield_copy_for(this.parent_df.options, this.doc.name, this.docfields);
this.docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name);
}
this.columns = {};

4
frappe/public/js/frappe/model/meta.js
View file

@ -38,14 +38,14 @@ $.extend(frappe.meta, {
frappe.meta.docfield_list[df.parent].push(df);
},
make_docfield_copy_for: function(doctype, docname) {
make_docfield_copy_for: function(doctype, docname, docfield_list=null) {
var c = frappe.meta.docfield_copy;
if(!c[doctype])
c[doctype] = {};
if(!c[doctype][docname])
c[doctype][docname] = {};
var docfield_list = frappe.meta.docfield_list[doctype] || [];
docfield_list = docfield_list || frappe.meta.docfield_list[doctype] || [];
for(var i=0, j=docfield_list.length; i<j; i++) {
var df = docfield_list[i];
c[doctype][docname][df.fieldname || df.label] = copy_dict(df);