Browse Source

[fix] [bug] open same doc via grid

version-14
Rushabh Mehta 10 years ago
parent
commit
d05a5129c9
3 changed files with 9 additions and 4 deletions
  1. +6
    -0
      frappe/public/js/frappe/form/grid.js
  2. +1
    -2
      frappe/public/js/frappe/views/formview.js
  3. +2
    -2
      frappe/public/js/legacy/form.js

+ 6
- 0
frappe/public/js/frappe/form/grid.js View File

@@ -5,6 +5,12 @@ frappe.ui.form.get_open_grid_form = function() {
return $(".grid-row-open").data("grid_row");
}

frappe.ui.form.close_grid_form = function() {
var open_form = frappe.ui.form.get_open_grid_form();
open_form && open_form.hide_form();
}


frappe.ui.form.Grid = Class.extend({
init: function(opts) {
$.extend(this, opts);


+ 1
- 2
frappe/public/js/frappe/views/formview.js View File

@@ -20,8 +20,7 @@ frappe.views.FormFactory = frappe.views.Factory.extend({
}

$(document).on("page-change", function() {
var open_form = frappe.ui.form.get_open_grid_form();
open_form && open_form.hide_form();
frappe.ui.form.close_grid_form();
});
},
show_doc: function(route) {


+ 2
- 2
frappe/public/js/legacy/form.js View File

@@ -348,6 +348,7 @@ _f.Frm.prototype.refresh = function(docname) {
scroll(0, 0);
this.hide_print();
}
frappe.ui.form.close_grid_form();
this.docname = docname;
}

@@ -565,8 +566,7 @@ _f.Frm.prototype.save = function(save_action, callback, btn, on_error) {
btn && $(btn).prop("disabled", true);
$(document.activeElement).blur();

var open_form = frappe.ui.form.get_open_grid_form();
open_form && open_form.hide_form();
frappe.ui.form.close_grid_form();

// let any pending js process finish
var me = this;


Loading…
Cancel
Save