Replace required_level (GA) decorators with the simpler ga_required one.

licenses/views.py

@@ -13,7 +13,7 @@
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def license_index(request):
     """Sal index page for licenses."""
     context = {'request': request,
@@ -24,7 +24,7 @@ def license_index(request):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def new_license(request):
     """Creates a new License object"""
     if request.method == 'POST':
@@ -41,7 +41,7 @@ def new_license(request):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def edit_license(request, license_id):
     license = get_object_or_404(License, pk=license_id)
 
@@ -59,7 +59,7 @@ def edit_license(request, license_id):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def delete_license(request, license_id):
     license = get_object_or_404(License, pk=license_id)
     license.delete()

sal/decorators.py

@@ -196,7 +196,6 @@ def ga_required(function):
 
     Wrapped function must have the request object as the first argument.
     """
-    # TODO: This can be removed once a class_required_level decoratir is created
     @wraps(function)
     def wrapper(*args, **kwargs):
         if args[0].user.userprofile.level != ProfileLevel.global_admin:

server/settings_views.py

@@ -10,7 +10,7 @@
 from django.urls import reverse
 
 import sal.plugin
-from sal.decorators import required_level, staff_required
+from sal.decorators import ga_required, staff_required
 from server import utils
 from server import forms
 from server.models import ProfileLevel, Plugin, ApiKey, Report, MachineDetailPlugin, UserProfile
@@ -27,7 +27,7 @@ def new_version_never(request):
     return redirect(reverse('home'))
 
 
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def update_notify_date(request, length='never'):
     # Don't notify about a new version until there is a new one
     version_report = utils.check_version()
@@ -52,7 +52,7 @@ def new_version_day(request):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 @staff_required
 def manage_users(request):
     try:
@@ -65,7 +65,7 @@ def manage_users(request):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 @staff_required
 def new_user(request):
     c = {}
@@ -86,7 +86,7 @@ def new_user(request):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 @staff_required
 def edit_user(request, user_id):
     the_user = get_object_or_404(User, pk=int(user_id))
@@ -120,7 +120,7 @@ def edit_user(request, user_id):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def user_add_staff(request, user_id):
     if request.user.id == int(user_id):
         # You shouldn't have been able to get here anyway
@@ -132,7 +132,7 @@ def user_add_staff(request, user_id):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def user_remove_staff(request, user_id):
     if request.user.id == int(user_id):
         # You shouldn't have been able to get here anyway
@@ -144,7 +144,7 @@ def user_remove_staff(request, user_id):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def delete_user(request, user_id):
     if request.user.id == int(user_id):
         # You shouldn't have been able to get here anyway
@@ -155,7 +155,7 @@ def delete_user(request, user_id):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def settings_page(request):
     historical_setting = utils.get_setting('historical_retention')
     historical_setting_form = forms.SettingsHistoricalDataForm(initial={'days': historical_setting})
@@ -171,21 +171,21 @@ def settings_page(request):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def senddata_enable(request):
     utils.set_setting('send_data', True)
     return HttpResponseRedirect(request.META.get('HTTP_REFERER'))
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def senddata_disable(request):
     utils.set_setting('send_data', False)
     return HttpResponseRedirect(request.META.get('HTTP_REFERER'))
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def settings_historical_data(request):
     if request.method == 'POST':
         form = forms.SettingsHistoricalDataForm(request.POST)
@@ -200,23 +200,23 @@ def settings_historical_data(request):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def plugins_page(request):
     utils.reload_plugins_model()
     context = {'plugins': utils.get_active_and_inactive_plugins('machines')}
     return render(request, 'server/plugins.html', context)
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def settings_reports(request):
     utils.reload_plugins_model()
     context = {'plugins': utils.get_active_and_inactive_plugins('report')}
     return render(request, 'server/reports.html', context)
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def settings_machine_detail_plugins(request):
     utils.reload_plugins_model()
     plugins = utils.get_active_and_inactive_plugins('machine_detail')
@@ -237,7 +237,7 @@ def plugin_minus(request, plugin_id):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def _swap_plugin(request, plugin_id, direction, plugin_model=Plugin):
     # get current plugin order
     current_plugin = get_object_or_404(plugin_model, pk=plugin_id)
@@ -264,15 +264,15 @@ def _swap_plugin(request, plugin_id, direction, plugin_model=Plugin):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def plugin_disable(request, plugin_id):
     plugin = get_object_or_404(Plugin, pk=plugin_id)
     plugin.delete()
     return redirect('plugins_page')
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def plugin_enable(request, plugin_name):
     # only do this if there isn't a plugin already with the name
     try:
@@ -284,29 +284,29 @@ def plugin_enable(request, plugin_name):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def machine_detail_plugin_plus(request, plugin_id):
     _swap_plugin(request, plugin_id, 1, MachineDetailPlugin)
     return redirect('settings_machine_detail_plugins')
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def machine_detail_plugin_minus(request, plugin_id):
     _swap_plugin(request, plugin_id, -1, MachineDetailPlugin)
     return redirect('settings_machine_detail_plugins')
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def machine_detail_plugin_disable(request, plugin_id):
     plugin = get_object_or_404(MachineDetailPlugin, pk=plugin_id)
     plugin.delete()
     return redirect('settings_machine_detail_plugins')
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def machine_detail_plugin_enable(request, plugin_name):
     # only do this if there isn't a plugin already with the name
     try:
@@ -324,15 +324,15 @@ def machine_detail_plugin_enable(request, plugin_name):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def settings_report_disable(request, plugin_id):
     plugin = get_object_or_404(Report, pk=plugin_id)
     plugin.delete()
     return redirect('settings_reports')
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def settings_report_enable(request, plugin_name):
     # only do this if there isn't a plugin already with the name
     try:
@@ -344,15 +344,15 @@ def settings_report_enable(request, plugin_name):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def api_keys(request):
     api_keys = ApiKey.objects.all()
     c = {'user': request.user, 'api_keys': api_keys, 'request': request}
     return render(request, 'server/api_keys.html', c)
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def new_api_key(request):
     c = {}
     c.update(csrf(request))
@@ -368,7 +368,7 @@ def new_api_key(request):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def display_api_key(request, key_id):
     api_key = get_object_or_404(ApiKey, pk=int(key_id))
     if api_key.has_been_seen:
@@ -381,7 +381,7 @@ def display_api_key(request, key_id):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def edit_api_key(request, key_id):
     api_key = get_object_or_404(ApiKey, pk=int(key_id))
     c = {}
@@ -399,7 +399,7 @@ def edit_api_key(request, key_id):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def delete_api_key(request, key_id):
     api_key = get_object_or_404(ApiKey, pk=int(key_id))
     api_key.delete()

server/views.py

@@ -10,7 +10,8 @@
 from django.template.context_processors import csrf
 
 import sal.plugin
-from sal.decorators import required_level, ProfileLevel, access_required, is_global_admin
+from sal.decorators import (
+    required_level, ProfileLevel, access_required, is_global_admin, ga_required)
 from server.forms import (BusinessUnitForm, EditUserBusinessUnitForm, EditBusinessUnitForm,
                           MachineGroupForm, EditMachineGroupForm, NewMachineForm)
 from server.models import (BusinessUnit, MachineGroup, Machine, UserProfile, Report, Plugin,
@@ -122,7 +123,7 @@ def report_load(request, plugin_name, group_type='all', group_id=None):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def new_business_unit(request):
     c = {}
     c.update(csrf(request))
@@ -140,7 +141,7 @@ def new_business_unit(request):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def edit_business_unit(request, bu_id):
     business_unit = get_object_or_404(BusinessUnit, pk=int(bu_id))
     c = {}
@@ -165,7 +166,7 @@ def edit_business_unit(request, bu_id):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def delete_business_unit(request, bu_id):
     business_unit = get_object_or_404(BusinessUnit, pk=int(bu_id))
 
@@ -180,7 +181,7 @@ def delete_business_unit(request, bu_id):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def really_delete_business_unit(request, bu_id):
     business_unit = get_object_or_404(BusinessUnit, pk=int(bu_id))
     business_unit.delete()
@@ -211,7 +212,7 @@ def bu_dashboard(request, **kwargs):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def delete_machine_group(request, group_id):
     machine_group = get_object_or_404(MachineGroup, pk=int(group_id))
 
@@ -226,7 +227,7 @@ def delete_machine_group(request, group_id):
 
 
 @login_required
-@required_level(ProfileLevel.global_admin)
+@ga_required
 def really_delete_machine_group(request, group_id):
     machine_group = get_object_or_404(MachineGroup, pk=int(group_id))
     business_unit = machine_group.business_unit