We had two ways of indicating to the templates that the current user role was a service administrator or a system administrator. Consolidate these and only use the better approach.
Tested by logging in as both kinds of administrator and as a provider and checking that the main navigation menu was unchanged and that the appropriate script.js file was in the page source (admin/script.js for service admins, system/script.js for system admins, js/script.js for providers).
The changes in this PR are on top of those in PR #984, so no review is needed until #984 is merged and this is rebased.
We had two ways of indicating to the templates that the current user role was a service administrator or a system administrator. Consolidate these and only use the better approach.
Tested by logging in as both kinds of administrator and as a provider and checking that the main navigation menu was unchanged and that the appropriate script.js file was in the page source (
admin/script.js
for service admins,system/script.js
for system admins,js/script.js
for providers).The changes in this PR are on top of those in PR #984, so no review is needed until #984 is merged and this is rebased.