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

fix in search

Browse source
This commit is contained in:
Anand Doshi 2012-03-22 13:25:01 +05:30
parent 5a297fac64
commit d0c74286d0
3 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/wn/ui/toolbar.min.js vendored
View file

@ -12,7 +12,7 @@ wn.ui.toolbar.NewDialog=wn.ui.toolbar.SelectorDialog.extend({init:function(){thi
/*
* lib/js/wn/ui/toolbar/search.js
*/
wn.ui.toolbar.Search=wn.ui.toolbar.SelectorDialog.extend({init:function(){this._super({title:"Search",execute:function(val){selector.set_search(val);selector.show();},});this.set_values(profile.can_read.join(',').split(','));makeselector();}});
wn.ui.toolbar.Search=wn.ui.toolbar.SelectorDialog.extend({init:function(){this._super({title:"Search",execute:function(val){selector.set_search(val);selector.show();},});this.set_values(profile.can_search.join(',').split(','));makeselector();}});
/*
* lib/js/wn/ui/toolbar/report.js
*/

4
js/wn/ui/toolbar/search.js
View file

@ -33,9 +33,9 @@ wn.ui.toolbar.Search = wn.ui.toolbar.SelectorDialog.extend({
});
// get new types
this.set_values(profile.can_read.join(',').split(','));
this.set_values(profile.can_search.join(',').split(','));
// global search selector
makeselector();
}
});
});

51
py/webnotes/profile.py
View file

@ -30,12 +30,13 @@ class Profile:
def __init__(self, name=''):
self.name = name or webnotes.session.get('user')
self.roles = []
self.all_read = []
self.can_create = []
self.can_read = []
self.can_write = []
self.can_cancel = []
self.can_search = []
self.can_get_report = []
self.allow_modules = []
@ -100,30 +101,35 @@ class Profile:
for dt in self.doctype_map:
dtp = self.doctype_map[dt]
p = self.perm_map.get(dt, {})
if (p.get('read') or p.get('write')) and (not dtp.get('istable')) \
and (not dtp.get('read_only')):
self.can_read.append(dt)
if not dtp['module'] in self.allow_modules:
self.allow_modules.append(dtp['module'])
if p.get('write') and not dtp.get('istable'):
self.can_write.append(dt)
if p.get('create') and (not dtp.get('in_create')) and (not dtp.get('istable')) \
and (not dtp.get('issingle')):
self.can_create.append(dt)
if (p.get('read') or p.get('write')) and (not dtp.get('read_only')):
self.can_get_report.append(dt)
self.can_get_report += dtp['child_tables']
if p.get('read') or p.get('write'):
self.all_read.append(dt)
if not dtp.get('istable'):
if p.get('create') and not dtp.get('in_create') and \
not dtp.get('issingle'):
self.can_create.append(dt)
elif p.get('write'):
self.can_write.append(dt)
elif p.get('read'):
if dtp.get('read_only'):
self.all_read.append(dt)
else:
self.can_read.append(dt)
if p.get('cancel'):
self.can_cancel.append(dt)
if (p.get('read') or p.get('write') or p.get('create')) and \
not dtp.get('read_only'):
self.can_get_report.append(dt)
self.can_get_report += dtp['child_tables']
if not dtp.get('istable'):
if not dtp.get('issingle'):
self.can_search.append(dt)
if not dtp.get('module') in self.allow_modules:
self.allow_modules.append(dtp.get('module'))
self.can_write += self.can_create
self.can_read += self.can_write
self.all_read += self.can_read
def get_home_page(self):
"""
@ -231,6 +237,7 @@ class Profile:
d['can_get_report'] = list(set(self.can_get_report))
d['allow_modules'] = self.allow_modules
d['all_read'] = self.all_read
d['can_search'] = list(set(self.can_search))
return d