Merge branch 'inventree:master' into matmair/issue2694

InvenTree/users/admin.py

@@ -49,7 +49,7 @@ class InvenTreeGroupAdminForm(forms.ModelForm):
             'users',
         ]
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs):  # pragma: no cover
         super().__init__(*args, **kwargs)
 
         if self.instance.pk:
@@ -65,12 +65,12 @@ class InvenTreeGroupAdminForm(forms.ModelForm):
         help_text=_('Select which users are assigned to this group')
     )
 
-    def save_m2m(self):
+    def save_m2m(self):  # pragma: no cover
         # Add the users to the Group.
 
         self.instance.user_set.set(self.cleaned_data['users'])
 
-    def save(self, *args, **kwargs):
+    def save(self, *args, **kwargs):  # pragma: no cover
         # Default save
         instance = super().save()
         # Save many-to-many data
@@ -78,7 +78,7 @@ class InvenTreeGroupAdminForm(forms.ModelForm):
         return instance
 
 
-class RoleGroupAdmin(admin.ModelAdmin):
+class RoleGroupAdmin(admin.ModelAdmin):  # pragma: no cover
     """
     Custom admin interface for the Group model
     """

InvenTree/users/api.py

@@ -100,7 +100,7 @@ class RoleDetails(APIView):
             if len(permissions) > 0:
                 roles[role] = permissions
             else:
-                roles[role] = None
+                roles[role] = None  # pragma: no cover
 
         data = {
             'user': user.pk,

InvenTree/users/models.py

@@ -267,9 +267,9 @@ class RuleSet(models.Model):
             model=model
         )
 
-    def __str__(self, debug=False):
+    def __str__(self, debug=False):  # pragma: no cover
         """ Ruleset string representation """
-        if debug:  # pragma: no cover
+        if debug:
             # Makes debugging easier
             return f'{str(self.group).ljust(15)}: {self.name.title().ljust(15)} | ' \
                    f'v: {str(self.can_view).ljust(5)} | a: {str(self.can_add).ljust(5)} | ' \
@@ -319,7 +319,7 @@ def split_permission(app, perm):
     """split permission string into permission and model"""
     permission_name, *model = perm.split('_')
     # handle models that have underscores
-    if len(model) > 1:
+    if len(model) > 1:  # pragma: no cover
         app += '_' + '_'.join(model[:-1])
         perm = permission_name + '_' + model[-1:][0]
     model = model[-1:][0]
@@ -375,7 +375,7 @@ def update_group_roles(group, debug=False):
             allowed - Whether or not the action is allowed
         """
 
-        if action not in ['view', 'add', 'change', 'delete']:
+        if action not in ['view', 'add', 'change', 'delete']:  # pragma: no cover
             raise ValueError("Action {a} is invalid".format(a=action))
 
         permission_string = RuleSet.get_model_permission_string(model, action)
@@ -576,7 +576,7 @@ class Owner(models.Model):
         return owners
 
     @staticmethod
-    def get_api_url():
+    def get_api_url():  # pragma: no cover
         return reverse('api-owner-list')
 
     class Meta: