mirror of https://github.com/jumpserver/jumpserver
Remove action from asset permission
parent
74b8ee8c10
commit
d9812e2bdb
|
@ -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',
|
||||
|
|
|
@ -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'))
|
||||
|
|
|
@ -43,8 +43,6 @@
|
|||
{{ form.system_users |bootstrap_horizontal }}
|
||||
<div class="hr-line-dashed"></div>
|
||||
<h3>{% trans 'Other' %}</h3>
|
||||
{{ form.action|bootstrap_horizontal }}
|
||||
|
||||
<div class="form-group">
|
||||
<label for="{{ form.is_active.id_for_label }}" class="col-sm-2 control-label">{% trans 'Active' %}</label>
|
||||
<div class="col-sm-8">
|
||||
|
|
|
@ -80,10 +80,6 @@
|
|||
<td>{% trans 'Action' %}:</td>
|
||||
<td><b>{{ asset_permission.get_action_display }}</b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{% trans 'Is active' %}:</td>
|
||||
<td><b>{{ asset_permission.is_active|yesno:'Yes, No, Unkown' }}</b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{% trans 'Date expired' %}:</td>
|
||||
<td><b>{{ asset_permission.date_expired }}</b></td>
|
||||
|
|
Loading…
Reference in New Issue