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 
Conflicts:
	public/js/wn/views/query_report.js
This commit is contained in:
Anand Doshi 2012-10-04 19:29:36 +05:30
commit e8fca82f80
3 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/doctype/report/report.txt
View file

@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
u'creation': '2012-06-13 19:07:26',
u'creation': '2012-10-02 15:44:56',
u'docstatus': 0,
u'modified': '2012-10-01 17:58:19',
u'modified': '2012-10-04 17:30:52',
u'modified_by': u'Administrator',
u'owner': u'Administrator'
},
@ -85,7 +85,8 @@
{
'cancel': 1,
u'doctype': u'DocPerm',
'role': u'Administrator'
'role': u'Administrator',
'write': 1
},
# DocPerm
@ -100,7 +101,8 @@
{
'cancel': 1,
u'doctype': u'DocPerm',
'role': u'Report Manager'
'role': u'Report Manager',
'write': 1
},
# DocPerm

23
public/js/wn/misc/utils.js Normal file
View file

@ -0,0 +1,23 @@
wn.provide('wn.utils');
wn.utils.comma_or = function(list) {
return wn.utils.comma_sep(list, " or ");
}
wn.utils.comma_and = function(list) {
return wn.utils.comma_sep(list, " and ");
}
wn.utils.comma_sep = function(list, sep) {
if(list instanceof Array) {
if(list.length==0) {
return "";
} else if (list.length==1) {
return list[0];
} else {
return list.slice(0, list.length-1).join(", ") + sep + list.slice(-1)[0];
}
} else {
return list;
}
}

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

@ -413,8 +413,11 @@ wn.views.QueryReport = Class.extend({
});
},
export: function() {
wn.downloadify(wn.slickgrid_tools.get_view_data(this.columns, this.dataView),
["Report Manager", "System Manager"]);
return false;
var result = $.map(wn.slickgrid_tools.get_view_data(this.columns, this.dataView),
function(row) {
return [row.splice(1)];
});
wn.downloadify(result, ["Report Manager", "System Manager"]);
return false;
}
})