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

Merge branch 'child_perms'

Browse source
This commit is contained in:
Anand Doshi 2012-12-24 19:39:41 +05:30
commit 9ea121afbf
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
public/js/legacy/widgets/form/form_grid.js
View file

@ -83,21 +83,23 @@ _f.FormGrid.prototype.make_tbar_link = function(parent, label, fn, icon) {
}
_f.FormGrid.prototype.make_columns = function() {
var gl = wn.meta.docfield_list[this.field.df.options];
if(!gl) {
alert('Table details not found "'+this.field.df.options+'"');
}
gl.sort(function(a,b) { return a.idx - b.idx});
var p = this.field.perm;
for(var i=0;i<gl.length;i++) {
if(p[this.field.df.permlevel] && p[this.field.df.permlevel][READ]) { // if read
if(p[this.field.df.permlevel] && p[this.field.df.permlevel][READ]) { // if read
var gl = wn.meta.docfield_list[this.field.df.options];
if(!gl) {
alert('Table details not found "'+this.field.df.options+'"');
}
gl.sort(function(a,b) { return a.idx - b.idx});
for(var i=0;i<gl.length;i++) {
this.insert_column(this.field.df.options, gl[i].fieldname, gl[i].fieldtype, gl[i].label, gl[i].width, gl[i].options, this.field.perm, gl[i].reqd);
// hide it even if it is hidden at start..
// so that it can be brought back once
if(gl[i].hidden) {
// also, hide column if no permissions found
if(gl[i].hidden || !(p[gl[i].permlevel] && p[gl[i].permlevel][READ])) {
this.set_column_disp(gl[i].fieldname, false);
}
}

4
public/js/wn/print/print_table.js
View file

@ -40,8 +40,10 @@ wn.print.Table = Class.extend({
this.make();
},
get_columns: function() {
var perms = wn.perm.get_perm(this.doctype, this.docname);
return ['Sr'].concat($.map(wn.meta.docfield_list[this.tabletype], function(df) {
return cint(df.print_hide) ? null : df.fieldname;
return (cint(df.print_hide) || !(perms[df.permlevel] &&
perms[df.permlevel][READ])) ? null : df.fieldname;
}));
},
get_data: function() {