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

Swap order of arguments to get_template_folders

Browse Source 
So that the order is the same as the arguments passed to `get_templates`
This commit is contained in:
Chris Hill-Scott
2018-11-13 12:29:57 +00:00
parent 6c4b6774aa
commit 045a4bb7f1
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/templates.py
View File

@@ -126,7 +126,7 @@ def choose_template(service_id, template_type='all', template_folder_id=None):
current_template_folder_id=template_folder_id, current_template_folder_id=template_folder_id,
can_manage_folders=can_manage_folders(), can_manage_folders=can_manage_folders(),
template_folder_path=current_service.get_template_folder_path(template_folder_id), template_folder_path=current_service.get_template_folder_path(template_folder_id),
template_folders=current_service.get_template_folders(template_folder_id, template_type), template_folders=current_service.get_template_folders(template_type, template_folder_id),
templates=current_service.get_templates(template_type, template_folder_id), templates=current_service.get_templates(template_type, template_folder_id),
show_search_box=(len(current_service.get_templates(template_type)) > 7), show_search_box=(len(current_service.get_templates(template_type)) > 7),
show_template_nav=( show_template_nav=(

6
app/models/service.py
View File

@@ -298,7 +298,7 @@ class Service():
def all_template_folder_ids(self): def all_template_folder_ids(self):
return {folder['id'] for folder in self.all_template_folders} return {folder['id'] for folder in self.all_template_folders}
def get_template_folders(self, parent_folder_id=None, template_type='all'): def get_template_folders(self, template_type='all', parent_folder_id=None):
return [ return [
folder for folder in self.all_template_folders folder for folder in self.all_template_folders
if ( if (
@@ -317,7 +317,7 @@ class Service():
if any( if any(
self.show_folder(child_folder['id'], template_type) self.show_folder(child_folder['id'], template_type)
for child_folder in self.get_template_folders(template_folder_id, template_type) for child_folder in self.get_template_folders(template_type, template_folder_id)
): ):
return True return True
@@ -341,7 +341,7 @@ class Service():
def get_template_folders_and_templates(self, template_type, template_folder_id): def get_template_folders_and_templates(self, template_type, template_folder_id):
return ( return (
self.get_templates(template_type, template_folder_id) + self.get_templates(template_type, template_folder_id) +
self.get_template_folders(template_folder_id, template_type) self.get_template_folders(template_type, template_folder_id)
) )
def move_to_folder(self, ids_to_move, move_to): def move_to_folder(self, ids_to_move, move_to):

2
app/templates/views/templates/_template_list.html
View File

@@ -18,7 +18,7 @@
</h2> </h2>
<p class="message-type"> <p class="message-type">
{{ folder_contents_count( {{ folder_contents_count(
current_service.get_template_folders(template_folder.id, template_type)|length, current_service.get_template_folders(template_type, template_folder.id)|length,
current_service.get_templates(template_type, template_folder.id)|length, current_service.get_templates(template_type, template_folder.id)|length,
) }} ) }}
</p> </p>