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

Merge pull request #2908 from jumpserver/dev 

[Update] 修复创建资产是协议bug
pull/3007/head
老广 2019-07-08 19:04:31 +08:00 committed by GitHub
parent 65060a9416 c0cff6d1fe
commit e603730320
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/assets/templates/assets/asset_create.html
View File

@ -164,9 +164,15 @@ $(document).ready(function () {
if (protocol === "") { if (protocol === "") {
return return
} }
if (protocolLen === 0) { var formNameNum = [0];
protocolLen = protocolsRef.length; protocolsRef.children().find("select").each(function (i, v) {
} var fieldName = $(v).attr("name");
var num = fieldName.split('-')[1];
formNameNum.push(parseInt(num));
});
var protocolLenLast = Math.max(...formNameNum);
protocolLen = protocolLenLast + 1;
var selectName = "form-" + protocolLen + "-name"; var selectName = "form-" + protocolLen + "-name";
var selectId = "id_" + selectName; var selectId = "id_" + selectName;
var portName = "form-" + protocolLen + "-port"; var portName = "form-" + protocolLen + "-port";

2
apps/locale/zh/LC_MESSAGES/django.po
View File

@ -1216,7 +1216,7 @@ msgstr "连接"
#: assets/serializers/asset.py:21 #: assets/serializers/asset.py:21
msgid "Protocol format should {}/{}" msgid "Protocol format should {}/{}"
msgstr "" msgstr "协议格式 {}/{}"
#: assets/serializers/asset.py:38 #: assets/serializers/asset.py:38
msgid "Protocol duplicate: {}" msgid "Protocol duplicate: {}"