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

Merge pull request #1437 from rmehta/upload-grid

Browse source 
[minor] date formatting for bulk grid upload
This commit is contained in:
Anand Doshi 2015-11-27 14:46:05 +05:30
commit f535d6306e
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -249,6 +249,13 @@ frappe.ui.form.Grid = Class.extend({
if(!blank_row) {
var d = me.frm.add_child(me.df.fieldname);
$.each(row, function(ci, value) {
var fieldname = fieldnames[ci];
var df = frappe.meta.get_docfield(me.df.options, fieldname);
// convert date formatting
if(df.fieldtype==="Date" && value) {
value = frappe.datetime.user_to_str(value);
}
d[fieldnames[ci]] = value;
});
}
@ -266,6 +273,7 @@ frappe.ui.form.Grid = Class.extend({
var me = this;
$(this.wrapper).find(".grid-download").removeClass("hide").on("click", function() {
var data = [];
var docfields = [];
data.push([__("Bulk Edit {0}", [me.df.label])]);
data.push([]);
data.push([]);
@ -276,6 +284,7 @@ frappe.ui.form.Grid = Class.extend({
data[1].push(df.label);
data[2].push(df.fieldname);
data[3].push(df.description || "");
docfields.push(df);
}
});
@ -283,7 +292,14 @@ frappe.ui.form.Grid = Class.extend({
$.each(me.frm.doc[me.df.fieldname] || [], function(i, d) {
row = [];
$.each(data[2], function(i, fieldname) {
row.push(d[fieldname] || "");
var value = d[fieldname];
// format date
if(docfields[i].fieldtype==="Date" && value) {
value = frappe.datetime.str_to_user(value);
}
row.push(value || "");
});
data.push(row);
});

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

@ -99,6 +99,7 @@ frappe.ui.form.ScriptManager = Class.extend({
// css
doctype.__css && frappe.dom.set_style(doctype.__css);
this.trigger('setup');
},
log_error: function(caller, e) {
show_alert("Error in Client Script.");