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

Merge pull request #19469 from Tom-Finke/fix_child_table_in_dialog_sortable

Browse source 
closes https://github.com/frappe/frappe/issues/19468
This commit is contained in:
Shariq Ansari 2023-01-05 13:59:13 +05:30 • committed by GitHub
commit efeed5cffe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
frappe/public/js/frappe/form/grid.js
View file

@ -407,7 +407,7 @@ export default class Grid {
this.toggle_checkboxes(this.display_status !== "Read");
// sortable
if (this.frm && this.is_sortable() && !this.sortable_setup_done) {
if (this.is_sortable() && !this.sortable_setup_done) {
this.make_sortable($rows);
this.sortable_setup_done = true;
}
@ -553,17 +553,18 @@ export default class Grid {
let idx = $(event.item).closest(".grid-row").attr("data-idx") - 1;
let doc = this.data[idx % this.grid_pagination.page_length];
this.renumber_based_on_dom();
this.frm.script_manager.trigger(
this.df.fieldname + "_move",
this.df.options,
doc.name
);
this.frm &&
this.frm.script_manager.trigger(
this.df.fieldname + "_move",
this.df.options,
doc.name
);
this.refresh();
this.frm.dirty();
this.frm && this.frm.dirty();
},
});
$(this.frm.wrapper).trigger("grid-make-sortable", [this.frm]);
this.frm && $(this.frm.wrapper).trigger("grid-make-sortable", [this.frm]);
}
get_data(filter_field) {
@ -825,11 +826,11 @@ export default class Grid {
let $item = $(item);
let index =
(this.grid_pagination.page_index - 1) * this.grid_pagination.page_length + i;
let d = locals[this.doctype][$item.attr("data-name")];
let d = this.grid_rows_by_docname[$item.attr("data-name")].doc;
d.idx = index + 1;
$item.attr("data-idx", d.idx);
this.frm.doc[this.df.fieldname][index] = d;
if (this.frm) this.frm.doc[this.df.fieldname][index] = d;
this.data[index] = d;
this.grid_rows[index] = this.grid_rows_by_docname[d.name];
});