diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 2dfc31763..dc8ffb151 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1447,7 +1447,7 @@ max_input=Fill in at most four
no_need_input=Attributes no need to be filled in
close_link=Close
asn_group=ASN Group
-can_not_edit_issued_ans_group=Can not edit valid ASN group
+can_not_delete_issued_ans_group=Can not delete issued ASN
can_not_delete_asn_group_with_audited_ip=Can not delete ASN group with approved IP
organization=Organization
mismatch=Mismatch
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 68793e06f..6d89ee9b4 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1451,7 +1451,7 @@ max_input=\u0417\u0430\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043c\u0430\u0
no_need_input=\u041D\u0435 \u043D\u0443\u0436\u043D\u043E \u0437\u0430\u043F\u043E\u043B\u043D\u044F\u0442\u044C \u043F\u0440\u0438\u0437\u043D\u0430\u043A\u0438
close_link=\u0417\u0430\u043A\u0440\u044B\u0442\u043E\u0435 \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435
asn_group=ASN \u0433\u0440\u0443\u043F\u043F\u0430
-can_not_edit_issued_ans_group=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u0443\u044E \u0433\u0440\u0443\u043F\u043F\u0443 ASN
+can_not_delete_issued_ans_group=\u0412\u044B\u043F\u0443\u0449\u0435\u043D\u043D\u044B\u0439 ASN \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0443\u0434\u0430\u043B\u0435\u043D.
can_not_delete_asn_group_with_audited_ip=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0433\u0440\u0443\u043F\u043F\u0443 ASN \u0441 \u0443\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u043D\u044B\u043C IP-\u0430\u0434\u0440\u0435\u0441\u043E\u043C
organization=\u041E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u044F
mismatch=\u041D\u0435\u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index fa8009dcd..8f06b2892 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1447,7 +1447,7 @@ max_input=\u6700\u591a\u586b\u5199\u56db\u4e2a
no_need_input=\u65e0\u9700\u586b\u5199\u5c5e\u6027
close_link=\u5173\u95ed
asn_group=ASN\u7ec4
-can_not_edit_issued_ans_group=\u4e0d\u80fd\u4fee\u6539\u6709\u6548\u7684ASN\u7ec4
+can_not_delete_issued_ans_group=\u5DF2\u4E0B\u53D1ASN\u4E0D\u5141\u8BB8\u88AB\u5220\u9664
can_not_delete_asn_group_with_audited_ip=\u4e0d\u80fd\u5220\u9664\u5305\u542b\u5ba1\u6838\u901a\u8fc7ip\u7684ASN\u7ec4
organization=\u7ec4\u7ec7
mismatch=\u4e0d\u5339\u914d
diff --git a/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
index f1d299829..df3975a68 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
@@ -45,15 +45,20 @@
ids.push($(this).attr("id"));
asnIds.push($(this).attr("asnId"));
groupIds.push($(this).attr("asnGroup"));
- /* if($(this).attr("isIssued")==1){
+ if($(this).attr("isUsed")==1){
canDel=false;
- } */
+ }
}
});
- if(str.substr(str.length-1)== ','){
- ids = str.substr(0,str.length-1);
- }
- var tip='