diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index e94372d23..4c207d324 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1642,7 +1642,7 @@ obj_group_configuration=\u5BF9\u8C61\u7EC4\u7BA1\u7406 domain_group=\u57DF\u540D\u7EC4 url_group=URL\u7EC4 subscribe_id_group=\u8D26\u53F7\u7EC4 -at_least_one_group=\u8FB7\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u7EC4 +at_least_one_group=\u8BF7\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u7EC4 most_seven_group=\u81F3\u591A\u53EF\u9009\u62E9\u0037\u4E2A\u7EC4 most_eight_group=\u81F3\u591A\u53EF\u9009\u62E9\u0038\u4E2A\u7EC4 no_common_group=ID\u4E3A%s\u7684\u914D\u7F6E\u7F3A\u5C11\u7EC4 diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp index 3967797ea..1c3c76c0d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp @@ -167,7 +167,7 @@ $(function(){ top.$.jBox.tip("", ""); return; }else{ - if($("[name='userRegion1']").val()=="http"&&ipGroupLen>0){ + if(($("[name='userRegion1']").val()=="http"||$("[name='userRegion1']").val()=="mail")&&ipGroupLen>0){ if(grouplen>7){ top.$.jBox.tip("", ""); return;