darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 14:09:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add a user method to check folder permission

Browse Source 
User model is the most natural place for a permission check method,
however this means that we need to pass the full user object to
service model methods and TemplateList instead of user_id.
This commit is contained in:
Alexey Bezhan
2019-03-11 14:13:56 +00:00
parent 0f9207a161
commit e6d7f7ebeb
7 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/models/template_list.py
View File

@@ -5,28 +5,28 @@ class TemplateList():
service,
template_type='all',
template_folder_id=None,
user_id=None,
user=None,
):
self.service = service
self.template_type = template_type
self.template_folder_id = template_folder_id
self.user_id = user_id
self.user = user
def __iter__(self):
for item in self.get_templates_and_folders(
self.template_type, self.template_folder_id, self.user_id, ancestors=[]
self.template_type, self.template_folder_id, self.user, ancestors=[]
):
yield item
def get_templates_and_folders(self, template_type, template_folder_id, user_id, ancestors):
def get_templates_and_folders(self, template_type, template_folder_id, user, ancestors):
for item in self.service.get_template_folders(
template_type, template_folder_id, user_id,
template_type, template_folder_id, user,
):
yield TemplateListFolder(
item,
folders=self.service.get_template_folders(
template_type, item['id'], user_id
template_type, item['id'], user
),
templates=self.service.get_templates(
template_type, item['id']
@@ -35,12 +35,12 @@ class TemplateList():
service_id=self.service.id,
)
for sub_item in self.get_templates_and_folders(
template_type, item['id'], user_id, ancestors + [item]
template_type, item['id'], user, ancestors + [item]
):
yield sub_item
for item in self.service.get_templates(
template_type, template_folder_id, user_id
template_type, template_folder_id, user
):
yield TemplateListTemplate(
item,
@@ -59,24 +59,24 @@ class TemplateList():
@property
def folder_is_empty(self):
return not any(self.get_templates_and_folders(
'all', self.template_folder_id, self.user_id, []
'all', self.template_folder_id, self.user, []
))
class TemplateLists():
def __init__(self, services, user_id=None):
def __init__(self, services, user=None):
self.services = sorted(
services,
key=lambda service: service.name.lower(),
)
self.user_id = user_id
self.user = user
def __iter__(self):
if len(self.services) == 1:
for template_or_folder in TemplateList(self.services[0], user_id=self.user_id):
for template_or_folder in TemplateList(self.services[0], user=self.user):
yield template_or_folder
return
@@ -88,11 +88,11 @@ class TemplateLists():
yield template_list_service
for service_templates_and_folders in TemplateList(
service, user_id=self.user_id
service, user=self.user
).get_templates_and_folders(
template_type='all',
template_folder_id=None,
user_id=self.user_id,
user=self.user,
ancestors=[template_list_service],
):
yield service_templates_and_folders