diff --git a/apps/perms/forms.py b/apps/perms/forms.py index 1826b4c29..8638db75b 100644 --- a/apps/perms/forms.py +++ b/apps/perms/forms.py @@ -14,7 +14,7 @@ class AssetPermissionForm(forms.ModelForm): model = AssetPermission fields = [ 'name', 'users', 'user_groups', 'assets', 'asset_groups', - 'system_users', 'action', 'is_active', 'date_expired', 'comment', + 'system_users', 'is_active', 'date_expired', 'comment', ] widgets = { 'users': forms.SelectMultiple(attrs={'class': 'select2', diff --git a/apps/perms/models.py b/apps/perms/models.py index d90620a69..e71fb15c7 100644 --- a/apps/perms/models.py +++ b/apps/perms/models.py @@ -11,18 +11,12 @@ from common.utils import date_expired_default, combine_seq class AssetPermission(models.Model): - ACTION_CHOICE = ( - ('1', 'Allow'), - ('0', 'Deny'), - ) - name = models.CharField(max_length=128, verbose_name=_('Name')) users = models.ManyToManyField(User, related_name='asset_permissions', blank=True) user_groups = models.ManyToManyField(UserGroup, related_name='asset_permissions', blank=True) assets = models.ManyToManyField(Asset, related_name='granted_by_permissions', blank=True) asset_groups = models.ManyToManyField(AssetGroup, related_name='granted_by_permissions', blank=True) system_users = models.ManyToManyField(SystemUser, related_name='granted_by_permissions') - action = models.CharField(choices=ACTION_CHOICE, max_length=8, default='1') is_active = models.BooleanField(default=True, verbose_name=_('Active')) date_expired = models.DateTimeField(default=date_expired_default, verbose_name=_('Date expired')) created_by = models.CharField(max_length=128, blank=True, verbose_name=_('Created by')) diff --git a/apps/perms/templates/perms/asset_permission_create_update.html b/apps/perms/templates/perms/asset_permission_create_update.html index 68c023d59..15325f6f1 100644 --- a/apps/perms/templates/perms/asset_permission_create_update.html +++ b/apps/perms/templates/perms/asset_permission_create_update.html @@ -43,8 +43,6 @@ {{ form.system_users |bootstrap_horizontal }}

{% trans 'Other' %}

- {{ form.action|bootstrap_horizontal }} -
diff --git a/apps/perms/templates/perms/asset_permission_detail.html b/apps/perms/templates/perms/asset_permission_detail.html index ee4d1fab3..73e60acc8 100644 --- a/apps/perms/templates/perms/asset_permission_detail.html +++ b/apps/perms/templates/perms/asset_permission_detail.html @@ -80,10 +80,6 @@ {% trans 'Action' %}: {{ asset_permission.get_action_display }} - - {% trans 'Is active' %}: - {{ asset_permission.is_active|yesno:'Yes, No, Unkown' }} - {% trans 'Date expired' %}: {{ asset_permission.date_expired }}