Merge branch 'master' into flexible-data-retention

This commit is contained in:
Rebecca Law
2018-08-06 15:37:11 +01:00
70 changed files with 1378 additions and 363 deletions

View File

@@ -76,15 +76,17 @@ class HeaderNavigation(Navigation):
'add_organisation',
'create_email_branding',
'email_branding',
'find_users_by_email',
'live_services',
'organisations',
'platform_admin',
'platform_admin_list_complaints',
'suspend_service',
'trial_services',
'update_email_branding',
'user_information',
'view_provider',
'view_providers',
'platform_admin_list_complaints',
},
'sign-in': {
'sign_in',
@@ -124,6 +126,7 @@ class HeaderNavigation(Navigation):
'choose_account',
'choose_service',
'choose_template',
'choose_template_to_copy',
'confirm_edit_organisation_name',
'confirm_redact_template',
'conversation',
@@ -131,6 +134,7 @@ class HeaderNavigation(Navigation):
'conversation_reply_with_template',
'conversation_updates',
'cookies',
'copy_template',
'create_api_key',
'data_retention',
'delete_service_template',
@@ -292,8 +296,10 @@ class MainNavigation(Navigation):
'check_messages',
'check_notification',
'choose_template',
'choose_template_to_copy',
'confirm_redact_template',
'conversation_reply',
'copy_template',
'delete_service_template',
'edit_service_template',
'send_messages',
@@ -405,6 +411,7 @@ class MainNavigation(Navigation):
'error',
'features',
'feedback',
'find_users_by_email',
'forgot_password',
'get_example_csv',
'get_notifications_as_json',
@@ -478,6 +485,7 @@ class MainNavigation(Navigation):
'two_factor_email',
'two_factor_email_sent',
'update_email_branding',
'user_information',
'user_profile',
'user_profile_email',
'user_profile_email_authenticate',
@@ -517,6 +525,10 @@ class CaseworkNavigation(Navigation):
'view_notifications',
'view_notification',
},
'uploaded-files': {
'view_jobs',
'view_job',
},
}
exclude = {
@@ -547,6 +559,7 @@ class CaseworkNavigation(Navigation):
'check_notification',
'choose_account',
'choose_service',
'choose_template_to_copy',
'confirm_edit_organisation_name',
'confirm_redact_template',
'conversation',
@@ -554,6 +567,7 @@ class CaseworkNavigation(Navigation):
'conversation_reply_with_template',
'conversation_updates',
'cookies',
'copy_template',
'create_api_key',
'create_email_branding',
'data_retention',
@@ -576,6 +590,7 @@ class CaseworkNavigation(Navigation):
'error',
'features',
'feedback',
'find_users_by_email',
'forgot_password',
'get_example_csv',
'get_notifications_as_json',
@@ -696,6 +711,7 @@ class CaseworkNavigation(Navigation):
'two_factor_email_sent',
'update_email_branding',
'usage',
'user_information',
'user_profile',
'user_profile_email',
'user_profile_email_authenticate',
@@ -709,10 +725,8 @@ class CaseworkNavigation(Navigation):
'verify',
'verify_email',
'verify_mobile',
'view_job',
'view_job_csv',
'view_job_updates',
'view_jobs',
'view_letter_notification_as_preview',
'view_letter_template_preview',
'view_notification_updates',
@@ -775,12 +789,14 @@ class OrgNavigation(Navigation):
'choose_account',
'choose_service',
'choose_template',
'choose_template_to_copy',
'confirm_redact_template',
'conversation',
'conversation_reply',
'conversation_reply_with_template',
'conversation_updates',
'cookies',
'copy_template',
'create_api_key',
'create_email_branding',
'data_retention',
@@ -801,6 +817,7 @@ class OrgNavigation(Navigation):
'error',
'features',
'feedback',
'find_users_by_email',
'forgot_password',
'get_example_csv',
'get_notifications_as_json',
@@ -920,6 +937,7 @@ class OrgNavigation(Navigation):
'two_factor_email_sent',
'update_email_branding',
'usage',
'user_information',
'user_profile',
'user_profile_email',
'user_profile_email_authenticate',