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

Merge branch 'master' of github.com:webnotes/wnframework

Browse source
This commit is contained in:
Rushabh Mehta 2013-08-23 13:16:39 +05:30
commit 537c8f418e
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
public/js/wn/form/grid.js
View file

@ -201,11 +201,14 @@ wn.ui.form.GridRow = Class.extend({
}
},
remove: function() {
var me = this;
me.wrapper.toggle(false);
wn.model.clear_doc(me.doc.doctype, me.doc.name);
me.frm.dirty();
me.grid.refresh();
if(this.grid.is_editable()) {
var me = this;
me.wrapper.toggle(false);
wn.model.clear_doc(me.doc.doctype, me.doc.name);
me.frm.script_manager.trigger(me.grid.df.fieldname + "_remove", me.doc.doctype, me.doc.name);
me.frm.dirty();
me.grid.refresh();
}
},
insert: function(show) {
var idx = this.doc.idx;

12
public/js/wn/views/query_report.js
View file

@ -227,15 +227,17 @@ wn.views.QueryReport = Class.extend({
},
make_data: function(result, columns) {
var me = this;
this.data = $.map(result, function(row, row_idx) {
this.data = [];
for(var row_idx=0, l=result.length; row_idx < l; row_idx++) {
var row = result[row_idx];
var newrow = {};
for(var i=1, j=me.columns.length; i<j; i++) {
newrow[me.columns[i].field] = row[i-1];
for(var i=1, j=this.columns.length; i<j; i++) {
newrow[this.columns[i].field] = row[i-1];
};
newrow._id = row_idx + 1;
newrow.id = newrow.name ? newrow.name : ("_" + newrow._id);
return newrow;
});
this.data.push(newrow);
}
},
make_dataview: function() {
// initialize the model