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

[minor] [form] fixed 'New ..' refresh issue

Browse source
This commit is contained in:
Rushabh Mehta 2013-07-29 12:28:32 +05:30
parent 782fdaf8af
commit a81eaeba7a
3 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
public/js/wn/form/infobar.js
View file

@ -108,4 +108,19 @@ wn.ui.form.InfoBar = Class.extend({
}
},
go_prev_next: function(prev) {
var me = this;
wn.call({
method: "webnotes.widgets.form.utils.get_next",
args: {
doctype: me.frm.doctype,
name: me.frm.docname,
prev: prev ? 1 : 0
},
callback: function(r) {
if(r.message)
wn.set_route("Form", me.frm.doctype, r.message);
}
});
},
})

18
public/js/wn/form/toolbar.js
View file

@ -225,21 +225,5 @@ wn.ui.form.Toolbar = Class.extend({
if(this.actions_setup) return;
var menu = this.get_dropdown_menu("Actions");
this.actions_setup = true;
},
go_prev_next: function(prev) {
var me = this;
wn.call({
method: "webnotes.widgets.form.utils.get_next",
args: {
doctype: me.frm.doctype,
name: me.frm.docname,
prev: prev ? 1 : 0
},
callback: function(r) {
if(r.message)
wn.set_route("Form", me.frm.doctype, r.message);
}
});
},
}
})

16
public/js/wn/views/formview.js
View file

@ -7,7 +7,7 @@ wn.views.FormFactory = wn.views.Factory.extend({
make: function(route) {
var me = this,
dt = route[1];
if(!wn.views.formview[dt]) {
me.page = wn.container.add_page("Form/" + dt);
wn.views.formview[dt] = me.page;
@ -38,16 +38,22 @@ wn.views.FormFactory = wn.views.Factory.extend({
// make a new doc and set it
if(dn && dn.substr(0,4)=="New ") {
var new_name = wn.model.make_new_doc_and_get_name(dt);
wn.set_route("Form", dt, new_name)
if(new_name===dn) {
me.load(dt, dn);
} else {
wn.set_route("Form", dt, new_name)
}
} else {
wn.set_route('404');
}
return;
}
wn.container.change_to("Form/" + dt);
wn.views.formview[dt].frm.refresh(dn);
me.load(dt, dn);
});
},
load: function(dt, dn) {
wn.container.change_to("Form/" + dt);
wn.views.formview[dt].frm.refresh(dn);
}
});