github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2887 from jumpserver/dev_bugfix 

[Update] 修复授权规则更新失败的bug
pull/2890/head
BaiJiangJie 2019-07-05 16:41:17 +08:00 committed by GitHub
parent 423a487bd1 0512988979
commit 303cf41bb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/perms/forms/asset_permission.py
View File

@ -34,7 +34,7 @@ class ActionField(forms.MultipleChoiceField):
class AssetPermissionForm(OrgModelForm): class AssetPermissionForm(OrgModelForm):
action = ActionField() actions = ActionField()
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -73,7 +73,6 @@ class AssetPermissionForm(OrgModelForm):
'system_users': forms.SelectMultiple( 'system_users': forms.SelectMultiple(
attrs={'class': 'select2', 'data-placeholder': _('System user')} attrs={'class': 'select2', 'data-placeholder': _('System user')}
), ),
'actions': forms.CheckboxSelectMultiple()
} }
labels = { labels = {
'nodes': _("Node"), 'nodes': _("Node"),

1
apps/perms/templates/perms/asset_permission_create_update.html
View File

@ -159,7 +159,6 @@ $(document).ready(function () {
objectAttrsIsList(data, ['users', 'user_groups', 'system_users', 'nodes', 'assets', 'actions']); objectAttrsIsList(data, ['users', 'user_groups', 'system_users', 'nodes', 'assets', 'actions']);
objectAttrsIsDatetime(data, ['date_start', 'date_expired']); objectAttrsIsDatetime(data, ['date_start', 'date_expired']);
objectAttrsIsBool(data, ['is_active']); objectAttrsIsBool(data, ['is_active']);
console.log(data)
var props = { var props = {
url: the_url, url: the_url,
data: data, data: data,

5
apps/static/js/jumpserver.js
View File

@ -1082,7 +1082,10 @@ function htmlEscape ( d ) {
function objectAttrsIsList(obj, attrs) { function objectAttrsIsList(obj, attrs) {
attrs.forEach(function (attr) { attrs.forEach(function (attr) {
if (obj[attr] && !(obj[attr] instanceof Array)){ if (!obj[attr]){
obj[attr] = []
}
else if (obj[attr] && !(obj[attr] instanceof Array)){
obj[attr] = [obj[attr]] obj[attr] = [obj[attr]]
} }
}) })