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

Merge pull request #3131 from jumpserver/dev 

Dev
pull/3155/head
老广 2019-08-16 10:48:16 +08:00 committed by GitHub
parent a5e59e6787 088f815a30
commit 7d4e9c5669
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/applications/templates/applications/remote_app_create_update.html
View File

@ -110,16 +110,15 @@ function hiddenFields(){
function constructParams(data) { function constructParams(data) {
var typeList = ['chrome', 'mysql_workbench', 'vmware_client', 'custom']; var typeList = ['chrome', 'mysql_workbench', 'vmware_client', 'custom'];
var params = {}; var params = {};
for (var type in typeList){ $.each(typeList, function(index, value){
if (data.type === type){ if (data.type === value){
for (var k in data){ for (var k in data){
if (k.startsWith(data.type)){ if (k.startsWith(value)){
params[k] = data[k] params[k] = data[k]
} }
} }
break
}
} }
});
return params; return params;
} }
$(document).ready(function () { $(document).ready(function () {

4
apps/assets/backends/manager.py
View File

@ -71,9 +71,9 @@ class AssetUserManager:
if len(instances) == 1: if len(instances) == 1:
return instances[0] return instances[0]
elif len(instances) == 0: elif len(instances) == 0:
self.raise_does_not_exist(self.__name__) self.raise_does_not_exist(self.__class__.__name__)
else: else:
self.raise_multiple_return(self.__name__, len(instances)) self.raise_multiple_return(self.__class__.__name__, len(instances))
def raise_does_not_exist(self, name): def raise_does_not_exist(self, name):
raise self.ObjectDoesNotExist(self.MSG_NOT_EXIST.format(name)) raise self.ObjectDoesNotExist(self.MSG_NOT_EXIST.format(name))