darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 02:42:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix main_nav for platform admin

Browse Source 
Renamed or_ to any_
This commit is contained in:
Rebecca Law
2016-03-30 11:30:18 +01:00
parent 953f2a2245
commit e67bb5f716
10 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/views/choose_service.py
View File

@@ -10,14 +10,15 @@ from app.notify_client.api_client import ServicesBrowsableItem
def choose_service():
return render_template(
'views/choose-service.html',
services=[ServicesBrowsableItem(x) for x in service_api_client.get_services()['data']]
services=[ServicesBrowsableItem(x) for x in
service_api_client.get_services({'user_id': current_user.id})['data']]
)
@main.route("/services-or-dashboard")
@login_required
def show_all_services_or_dashboard():
services = service_api_client.get_services()['data']
services = service_api_client.get_services({'user_id': current_user.id})['data']
if 1 == len(services):
return redirect(url_for('.service_dashboard', service_id=services[0]['id']))

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

@@ -33,7 +33,7 @@ roles = {
@main.route("/services/<service_id>/users")
@login_required
@user_has_permissions('view_activity')
@user_has_permissions('view_activity', admin_override=True)
def manage_users(service_id):
return render_template(
'views/manage-users.html',

4
app/main/views/send.py
View File

@@ -70,7 +70,7 @@ def get_page_headings(template_type):
'send_emails',
'manage_templates',
'manage_api_keys',
admin_override=True, or_=True)
admin_override=True, any_=True)
def choose_template(service_id, template_type):
service = service_api_client.get_service(service_id)['data']
@@ -145,7 +145,7 @@ def send_messages(service_id, template_id):
@main.route("/services/<service_id>/send/<template_id>.csv", methods=['GET'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', or_=True)
@user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', any_=True)
def get_example_csv(service_id, template_id):
template = Template(templates_dao.get_service_template_or_404(service_id, template_id)['data'])
output = io.StringIO()