github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-21 15:58:52 +00:00
Code Issues Projects Releases Wiki Activity

[Update] merge from dev to lina

Browse Source
This commit is contained in:
Bai
2020-05-27 18:44:12 +08:00
parent 566419cac4 0b17d55f30
commit 7afff5e392
19 changed files with 215 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/perms/apps.py
View File

@@ -5,3 +5,7 @@ from django.apps import AppConfig
class PermsConfig(AppConfig):
name = 'perms'
def ready(self):
super().ready()
from . import signals_handler

2
apps/perms/templates/perms/asset_permission_user.html
View File

@@ -218,7 +218,7 @@ function addGroups(groupsId) {
}
function removeGroup(groupId) {
var theUrl = "{% url 'api-perms:asset-permissions-user-groups-relation-list' %}?assetpermission={{ object.id }}";
var theUrl = "{% url 'api-perms:asset-permissions-user-groups-relation-list' %}?assetpermission={{ object.id }}&usergroup=groupId";
theUrl = theUrl.replace("groupId", groupId);
var success = function(data) {
location.reload();

2
apps/perms/templates/perms/database_app_permission_user.html
View File

@@ -218,7 +218,7 @@ function addGroups(groupsId) {
}
function removeGroup(groupId) {
var theUrl = "{% url 'api-perms:database-app-permissions-user-groups-relation-list' %}?databaseapppermission={{ object.id }}";
var theUrl = "{% url 'api-perms:database-app-permissions-user-groups-relation-list' %}?databaseapppermission={{ object.id }}&usergroup=groupId";
theUrl = theUrl.replace("groupId", groupId);
var success = function(data) {
location.reload();

6
apps/perms/templates/perms/remote_app_permission_user.html
View File

@@ -179,9 +179,13 @@
var body = {
user_groups: groups
};
var success = function(data) {
location.reload();
};
requestApi({
url: the_url,
body: JSON.stringify(body)
body: JSON.stringify(body),
success: success
});
}
$(document).ready(function () {

1
apps/perms/utils/asset_permission.py
View File

@@ -479,6 +479,7 @@ class ParserNode:
'platform': asset.platform_base,
'domain': asset.domain_id,
'org_name': asset.org_name,
'org_id': asset.org_id
},
}
}