🚸 fix #12771

src/main/resources/lang_en_US.properties

@@ -18,7 +18,7 @@
 
 #
 # Description: Solo language configurations(en_US).
-# Version: 2.33.0.1, Apr 19, 2019
+# Version: 2.33.0.2, Apr 28, 2019
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -117,7 +117,6 @@ draftListLabel=Drafts
 userManageLabel=Users
 commonUserLabel=Common User
 visitorUserLabel=visitor
-addCategoryLabel=Add Category
 updateUserLabel=Update User
 updateCategoryLabel=Update Category
 linkManagementLabel=Links

src/main/resources/lang_zh_CN.properties

@@ -18,7 +18,7 @@
 
 #
 # Description: Solo default language configurations(zh_CN).
-# Version: 2.33.0.1, Apr 19, 2019
+# Version: 2.33.0.2, Apr 28, 2019
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -117,7 +117,6 @@ draftListLabel=\u8349\u7A3F\u5939
 userManageLabel=\u7528\u6237\u7BA1\u7406
 commonUserLabel=\u4E00\u822C\u7528\u6237
 visitorUserLabel=\u8BBF\u5BA2\u7528\u6237
-addCategoryLabel=\u6DFB\u52A0\u5206\u7C7B
 updateUserLabel=\u66F4\u65B0\u7528\u6237
 updateCategoryLabel=\u66F4\u65B0\u5206\u7C7B
 linkManagementLabel=\u94FE\u63A5\u7BA1\u7406

src/main/webapp/admin/admin-category-list.ftl

@@ -23,7 +23,6 @@
 </div>
 <div class="fn__clear"></div>
 <div class="form form__no-table">
-${addCategoryLabel}
     <label for="categoryName">${linkTitle1Label}</label>
     <input id="categoryName" type="text"/>
     <label for="categoryURI">URI：</label>
@@ -37,16 +36,4 @@ ${addCategoryLabel}
     <button onclick="admin.categoryList.add();" class="fn__right">${saveLabel}</button>
     <div class="fn__clear"></div>
 </div>
-<div id="categoryUpdate" class="fn__none form__no-table form" data-title="${updateCategoryLabel}">
-    <label for="categoryNameUpdate">${linkTitle1Label}</label>
-    <input id="categoryNameUpdate" type="text"/>
-    <label for="categoryURIUpdate">URI：</label>
-    <input id="categoryURIUpdate" type="text"/>
-    <label for="categoryDescUpdate">${linkDescription1Label}</label>
-    <input id="categoryDescUpdate" type="text"/>
-    <label for="categoryTagsUpdate">${tags1Label}</label>
-    <input id="categoryTagsUpdate" type="text"/> <br><br>
-    <button onclick="admin.categoryList.update();" class="fn__right">${updateLabel}</button>
-    <div class="fn__clear"></div>
-</div>
 ${plugins}

src/main/webapp/js/admin/admin.min.js

@@ -12,7 +12,7 @@ admin.preference={locale:"",init:function(){$("#tabPreference").tabs(),$.ajax({u
 admin.themeList={skinDirName:"",mobileSkinDirName:"",init:function(){$.ajax({url:Label.servePath+"/console/skin",type:"GET",cache:!1,success:function(i,e){if($("#tipMsg").text(i.msg),i.sc){admin.themeList.skinDirName=i.skin.skinDirName,admin.themeList.mobileSkinDirName=i.skin.mobileSkinDirName;for(var a=JSON.parse(i.skin.skins),s="",t=0;t<a.length;t++){var n="";a[t].skinDirName===i.skin.skinDirName&&(n=" selected"),s+='<div class="fn__left skinItem'+n+'"><div class="ft__center">'+a[t].skinDirName+'</div><img class="skinPreview" src="'+Label.staticServePath+"/skins/"+a[t].skinDirName+'/preview.png"/><div>',a[t].skinDirName!==i.skin.skinDirName&&(s+='<button class="small update fn__left" data-name="'+a[t].skinDirName+'">'+Label.enableLabel+"</button>"),a[t].skinDirName!==i.skin.mobileSkinDirName&&(s+='<button class="small mobile fn__left" data-name="'+a[t].skinDirName+'">'+Label.setMobileLabel+"</button>"),s+='<button class="small fn__right" onclick="window.open(\''+Label.servePath+"?skin="+a[t].skinDirName+"')\">"+Label.previewLabel+"</button></div></div>"}$("#skinMain").html(s+"<div class='fn__clear'></div>"),$(".skinItem .update").click(function(){admin.themeList.update($(this).data("name"),"pc")}),$(".skinItem .mobile").click(function(){admin.themeList.update($(this).data("name"),"mobile")}),$("#loadMsg").text("")}else $("#loadMsg").text("")}})},update:function(i,e){$("#tipMsg").text(""),$("#loadMsg").text(Label.loadingLabel);var a={skin:{skinDirName:admin.themeList.skinDirName,mobileSkinDirName:admin.themeList.mobileSkinDirName}};"pc"===e?a.skin.skinDirName=i:a.skin.mobileSkinDirName=i,$.ajax({url:Label.servePath+"/console/skin",type:"PUT",cache:!1,data:JSON.stringify(a),success:function(i,e){$("#tipMsg").text(i.msg),i.sc&&admin.themeList.init(),$("#loadMsg").text("")}})}},admin.register["theme-list"]={obj:admin.themeList,init:admin.themeList.init,refresh:function(){$("#loadMsg").text("")}};
 admin.pluginList={tablePagination:new TablePaginate("plugin"),pageInfo:{currentCount:1,pageCount:1,currentPage:1},init:function(t){this.tablePagination.buildTable([{style:"padding-left: 12px;",text:Label.pluginNameLabel,index:"name",width:230},{style:"padding-left: 12px;",text:Label.statusLabel,index:"status",minWidth:80},{style:"padding-left: 12px;",text:Label.authorLabel,index:"author",width:200},{style:"padding-left: 12px;",text:Label.versionLabel,index:"version",width:120}]),this.tablePagination.initPagination(),$("#pluginSetting").dialog({width:700,height:180,modal:!0,hideFooter:!0}),this.getList(t)},getList:function(n){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text("");var l=this;$.ajax({url:Label.servePath+"/console/plugins/"+n+"/"+Label.PAGE_SIZE+"/"+Label.WINDOW_SIZE,type:"GET",cache:!1,success:function(t,e){if($("#tipMsg").text(t.msg),t.sc){admin.pluginList.pageInfo.currentPage=n;for(var a=t.plugins,i=0;i<a.length;i++)a[i].expendRow="<a href='javascript:void(0)' onclick=\"admin.pluginList.changeStatus('"+a[i].oId+"', '"+a[i].status+"')\">","ENABLED"===a[i].status?(a[i].status=Label.enabledLabel,a[i].expendRow+=Label.disableLabel):(a[i].status=Label.disabledLabel,a[i].expendRow+=Label.enableLabel),a[i].expendRow+="</a>  ","{}"!=a[i].setting&&(a[i].expendRow+="<a href='javascript:void(0)' onclick=\"admin.pluginList.toSetting('"+a[i].oId+"')\"> "+Label.settingLabel+" </a>  ");l.tablePagination.updateTablePagination(t.plugins,n,t.pagination),$("#loadMsg").text("")}else $("#loadMsg").text("")}})},toSetting:function(t){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text("");var e={oId:t};$.ajax({url:Label.servePath+"/console/plugin/toSetting",type:"POST",cache:!1,data:JSON.stringify(e),success:function(t,e){$("#tipMsg").text(t.msg),$("#pluginSetting").html(t),$("#pluginSetting").dialog("open"),$("#loadMsg").text("")}})},changeStatus:function(t,e){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text("");var a={oId:t,status:e="ENABLED"===e?"DISABLED":"ENABLED"};$.ajax({url:Label.servePath+"/console/plugin/status/",type:"PUT",cache:!1,data:JSON.stringify(a),success:function(t,e){$("#tipMsg").text(t.msg),t.sc?($("#loadMsg").text(""),window.location.reload()):$("#loadMsg").text("")}})}},admin.register["plugin-list"]={obj:admin.pluginList,init:admin.pluginList.init,refresh:function(){$("#loadMsg").text("")}};
 admin.userList={tablePagination:new TablePaginate("user"),pageInfo:{currentCount:1,pageCount:1,currentPage:1},userInfo:{oId:"",userRole:""},init:function(e){this.tablePagination.buildTable([{style:"padding-left: 12px;",text:Label.userNameLabel,index:"userName",width:230},{style:"padding-left: 12px;",text:Label.roleLabel,index:"isAdmin",width:120}]),this.tablePagination.initPagination(),this.getList(e),$("#userUpdate").dialog({width:700,height:450,modal:!0,hideFooter:!0})},getList:function(n){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text(""),this.pageInfo.currentPage=n;var r=this;$.ajax({url:Label.servePath+"/console/users/"+n+"/"+Label.PAGE_SIZE+"/"+Label.WINDOW_SIZE,type:"GET",cache:!1,success:function(e,a){if($("#tipMsg").text(e.msg),e.sc){var t=e.users,s=[];if(admin.userList.pageInfo.currentCount=t.length,admin.userList.pageInfo.pageCount=e.pagination.paginationPageCount,t.length<1)return $("#tipMsg").text("No user  "+Label.reportIssueLabel),void $("#loadMsg").text("");$("#tipMsg").text(Label.uploadMsg);for(var i=0;i<t.length;i++)s[i]={},s[i].userName=t[i].userName,"adminRole"===t[i].userRole?(s[i].isAdmin="&nbsp;"+Label.administratorLabel,s[i].expendRow="<a href='javascript:void(0)' onclick=\"admin.userList.get('"+t[i].oId+"', '"+t[i].userRole+"')\">"+Label.updateLabel+"</a>"):(s[i].expendRow="<a href='javascript:void(0)' onclick=\"admin.userList.get('"+t[i].oId+"', '"+t[i].userRole+"')\">"+Label.updateLabel+"</a>                                <a href='javascript:void(0)' onclick=\"admin.userList.del('"+t[i].oId+"', '"+encodeURIComponent(t[i].userName)+"')\">"+Label.removeLabel+"</a> <a href='javascript:void(0)' onclick=\"admin.userList.changeRole('"+t[i].oId+"')\">"+Label.changeRoleLabel+"</a>","defaultRole"===t[i].userRole?s[i].isAdmin=Label.commonUserLabel:s[i].isAdmin=Label.visitorUserLabel),r.tablePagination.updateTablePagination(s,n,e.pagination);$("#loadMsg").text("")}else $("#loadMsg").text("")}})},get:function(t,s){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text(""),$("#userUpdate").dialog("open"),$.ajax({url:Label.servePath+"/console/user/"+t,type:"GET",cache:!1,success:function(e,a){$("#tipMsg").text(e.msg),e.sc&&($("#userURLUpdate").val(e.user.userURL),$("#userAvatarUpdate").val(e.user.userAvatar),$("#userB3KeyUpdate").val(e.user.userB3Key),$("#userNameUpdate").val(e.user.userName).data("userInfo",{oId:t,userRole:s})),$("#loadMsg").text("")}})},update:function(){if(this.validate("Update")){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text("");var e=$("#userNameUpdate").data("userInfo"),a={userName:$("#userNameUpdate").val(),oId:e.oId,userURL:$("#userURLUpdate").val(),userRole:e.userRole,userAvatar:$("#userAvatarUpdate").val(),userB3Key:$("#userB3KeyUpdate").val()};$.ajax({url:Label.servePath+"/console/user/",type:"PUT",cache:!1,data:JSON.stringify(a),success:function(e,a){$("#userUpdate").dialog("close"),$("#tipMsg").text(e.msg),e.sc&&admin.userList.getList(admin.userList.pageInfo.currentPage),$("#loadMsg").text("")}})}},del:function(e,a){confirm(Label.confirmRemoveLabel+Label.userLabel+'"'+Util.htmlDecode(a)+'"?')&&($("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text(""),$.ajax({url:Label.servePath+"/console/user/"+e,type:"DELETE",cache:!1,success:function(e,a){if($("#tipMsg").text(e.msg),e.sc){var t=admin.userList.pageInfo.currentPage;1===admin.userList.pageInfo.currentCount&&1!==admin.userList.pageInfo.pageCount&&admin.userList.pageInfo.currentPage===admin.userList.pageInfo.pageCount&&(admin.userList.pageInfo.pageCount--,t=admin.userList.pageInfo.pageCount);var s=window.location.hash.split("/");t!==parseInt(s[s.length-1])&&admin.setHashByPage(t),admin.userList.getList(t),$("#loadMsg").text("")}else $("#loadMsg").text("")}}))},changeRole:function(e){$("#tipMsg").text(""),$.ajax({url:Label.servePath+"/console/changeRole/"+e,type:"GET",cache:!1,success:function(e,a){if($("#tipMsg").text(e.msg),e.sc){var t=admin.userList.pageInfo.currentPage;1===admin.userList.pageInfo.currentCount&&1!==admin.userList.pageInfo.pageCount&&admin.userList.pageInfo.currentPage===admin.userList.pageInfo.pageCount&&(admin.userList.pageInfo.pageCount--,t=admin.userList.pageInfo.pageCount);var s=window.location.hash.split("/");t!==parseInt(s[s.length-1])&&admin.setHashByPage(t),admin.userList.getList(t),$("#loadMsg").text("")}else $("#loadMsg").text("")}})},validate:function(e){e||(e="");var a=$("#userName"+e).val().replace(/(^\s*)|(\s*$)/g,"");return!(a.length<2||20<a.length)||($("#tipMsg").text(Label.nameTooLongLabel),$("#userName"+e).focus(),!1)}},admin.register["user-list"]={obj:admin.userList,init:admin.userList.init,refresh:admin.userList.getList};
-admin.categoryList={tablePagination:new TablePaginate("category"),pageInfo:{currentCount:1,pageCount:1,currentPage:1},init:function(e){this.tablePagination.buildTable([{text:"",index:"linkOrder",width:60},{style:"padding-left: 12px;",text:Label.titleLabel,index:"categoryTitle",width:230},{style:"padding-left: 12px;",text:"URI",index:"categoryURI",width:230},{style:"padding-left: 12px;",text:Label.descriptionLabel,index:"categoryDesc",minWidth:180}]),this.tablePagination.initPagination(),this.getList(e),$("#categoryUpdate").dialog({title:$("#categoryUpdate").data("title"),width:700,height:358,modal:!0,hideFooter:!0}),$.ajax({url:Label.servePath+"/console/tags",type:"GET",cache:!1,success:function(e,t){if($("#tipMsg").text(e.msg),e.sc){if(!(e.tags.length<=0)){for(var a=[],o=0;o<e.tags.length;o++)a.push(e.tags[o].tagTitle);$("#categoryTags").completed({height:160,buttonText:Label.selectLabel,data:a}),$("#loadMsg").text("")}}else $("#loadMsg").text("")}})},getList:function(g){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text(""),this.pageInfo.currentPage=g;var n=this;$.ajax({url:Label.servePath+"/console/categories/"+g+"/"+Label.PAGE_SIZE+"/"+Label.WINDOW_SIZE,type:"GET",cache:!1,success:function(e,t){if($("#tipMsg").text(e.msg),e.sc){var a=e.categories,o=[];admin.categoryList.pageInfo.currentCount=a.length,admin.categoryList.pageInfo.pageCount=0===e.pagination.paginationPageCount?1:e.pagination.paginationPageCount;for(var i=0;i<a.length;i++)o[i]={},0===i?1===a.length?o[i].linkOrder="":o[i].linkOrder='<div class="table-center" style="width:14px">                                <span onclick="admin.categoryList.changeOrder('+a[i].oId+", "+i+', \'down\');" class="icon-move-down"></span>                            </div>':i===a.length-1?o[i].linkOrder='<div class="table-center" style="width:14px">                                <span onclick="admin.categoryList.changeOrder('+a[i].oId+", "+i+', \'up\');" class="icon-move-up"></span>                            </div>':o[i].linkOrder='<div class="table-center" style="width:38px">                                <span onclick="admin.categoryList.changeOrder('+a[i].oId+", "+i+', \'up\');" class="icon-move-up"></span>                                <span onclick="admin.categoryList.changeOrder('+a[i].oId+", "+i+', \'down\');" class="icon-move-down"></span>                            </div>',o[i].categoryTitle=a[i].categoryTitle,o[i].categoryURI=a[i].categoryURI,o[i].categoryDesc=a[i].categoryDescription,o[i].expendRow="<a href='javascript:void(0)' onclick=\"admin.categoryList.get('"+a[i].oId+"')\">"+Label.updateLabel+"</a>                            <a href='javascript:void(0)' onclick=\"admin.categoryList.del('"+a[i].oId+"', '"+encodeURIComponent(a[i].categoryTitle)+"')\">"+Label.removeLabel+"</a> ";n.tablePagination.updateTablePagination(o,g,e.pagination),$("#loadMsg").text("")}else $("#loadMsg").text("")}})},add:function(){if(this.validate()){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text("");var e={categoryTitle:$("#categoryName").val(),categoryTags:$("#categoryTags").val(),categoryURI:$("#categoryURI").val(),categoryDescription:$("#categoryDesc").val()};$.ajax({url:Label.servePath+"/console/category/",type:"POST",cache:!1,data:JSON.stringify(e),success:function(e,t){if($("#tipMsg").text(e.msg),e.sc){$("#categoryName").val(""),$("#categoryTags").val(""),$("#categoryURI").val(""),$("#categoryDesc").val(""),admin.categoryList.pageInfo.currentCount===Label.PAGE_SIZE&&admin.categoryList.pageInfo.currentPage===admin.categoryList.pageInfo.pageCount&&admin.categoryList.pageInfo.pageCount++;var a=window.location.hash.split("/");admin.categoryList.pageInfo.pageCount!==parseInt(a[a.length-1])&&admin.setHashByPage(admin.categoryList.pageInfo.pageCount),admin.categoryList.getList(admin.categoryList.pageInfo.pageCount),$("#loadMsg").text("")}else $("#loadMsg").text("")}})}},get:function(a){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text(""),$("#categoryUpdate").dialog("open"),$.ajax({url:Label.servePath+"/console/category/"+a,type:"GET",cache:!1,success:function(e,t){$("#tipMsg").text(e.msg),e.sc&&($("#categoryNameUpdate").val(e.categoryTitle).data("oId",a),$("#categoryURIUpdate").val(e.categoryURI),$("#categoryDescUpdate").val(e.categoryDescription),$("#categoryTagsUpdate").val(e.categoryTags)),$("#loadMsg").text("")}})},update:function(){if(this.validate("Update")){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text("");var e={categoryTitle:$("#categoryNameUpdate").val(),oId:$("#categoryNameUpdate").data("oId"),categoryTags:$("#categoryTagsUpdate").val(),categoryURI:$("#categoryURIUpdate").val(),categoryDescription:$("#categoryDescUpdate").val()};$.ajax({url:Label.servePath+"/console/category/",type:"PUT",cache:!1,data:JSON.stringify(e),success:function(e,t){$("#categoryUpdate").dialog("close"),$("#tipMsg").text(e.msg),e.sc&&admin.categoryList.getList(admin.categoryList.pageInfo.currentPage),$("#loadMsg").text("")}})}},del:function(e,t){confirm(Label.confirmRemoveLabel+Label.categoryLabel+'"'+Util.htmlDecode(t)+'"?')&&($("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text(""),$.ajax({url:Label.servePath+"/console/category/"+e,type:"DELETE",cache:!1,success:function(e,t){if($("#tipMsg").text(e.msg),e.sc){var a=admin.categoryList.pageInfo.currentPage;1===admin.categoryList.pageInfo.currentCount&&1!==admin.categoryList.pageInfo.pageCount&&admin.categoryList.pageInfo.currentPage===admin.categoryList.pageInfo.pageCount&&(admin.categoryList.pageInfo.pageCount--,a=admin.categoryList.pageInfo.pageCount);var o=window.location.hash.split("/");a!==parseInt(o[o.length-1])&&admin.setHashByPage(a),admin.categoryList.getList(a),$("#loadMsg").text("")}else $("#loadMsg").text("")}}))},validate:function(e){e||(e="");var t=$("#categoryName"+e).val().replace(/(^\s*)|(\s*$)/g,"");if(t.length<2||32<t.length)$("#tipMsg").text(Label.categoryTooLongLabel),$("#categoryName"+e).focus();else{if(""!==$.trim($("#categoryTags"+e).val()))return!0;$("#tipMsg").text(Label.tagsEmptyLabel),$("#categoryTags"+e).focus()}return!1},changeOrder:function(e,t,a){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text("");var o={oId:e.toString(),direction:a};$.ajax({url:Label.servePath+"/console/category/order/",type:"PUT",cache:!1,data:JSON.stringify(o),success:function(e,t){$("#tipMsg").text(e.msg),admin.categoryList.getList(admin.categoryList.pageInfo.currentPage),$("#loadMsg").text("")}})}},admin.register["category-list"]={obj:admin.categoryList,init:admin.categoryList.init,refresh:admin.categoryList.getList};
+admin.categoryList={tablePagination:new TablePaginate("category"),pageInfo:{currentCount:1,pageCount:1,currentPage:1},init:function(e){this.tablePagination.buildTable([{text:"",index:"linkOrder",width:60},{style:"padding-left: 12px;",text:Label.titleLabel,index:"categoryTitle",width:230},{style:"padding-left: 12px;",text:"URI",index:"categoryURI",width:230},{style:"padding-left: 12px;",text:Label.descriptionLabel,index:"categoryDesc",minWidth:180}]),this.tablePagination.initPagination(),this.getList(e),$.ajax({url:Label.servePath+"/console/tags",type:"GET",cache:!1,success:function(e,a){if($("#tipMsg").text(e.msg),e.sc){if(!(e.tags.length<=0)){for(var t=[],o=0;o<e.tags.length;o++)t.push(e.tags[o].tagTitle);$("#categoryTags").completed({height:160,buttonText:Label.selectLabel,data:t}),$("#loadMsg").text("")}}else $("#loadMsg").text("")}})},getList:function(n){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text(""),this.pageInfo.currentPage=n;var g=this;$.ajax({url:Label.servePath+"/console/categories/"+n+"/"+Label.PAGE_SIZE+"/"+Label.WINDOW_SIZE,type:"GET",cache:!1,success:function(e,a){if($("#tipMsg").text(e.msg),e.sc){var t=e.categories,o=[];admin.categoryList.pageInfo.currentCount=t.length,admin.categoryList.pageInfo.pageCount=0===e.pagination.paginationPageCount?1:e.pagination.paginationPageCount;for(var i=0;i<t.length;i++)o[i]={},0===i?1===t.length?o[i].linkOrder="":o[i].linkOrder='<div class="table-center" style="width:14px">                                <span onclick="admin.categoryList.changeOrder('+t[i].oId+", "+i+', \'down\');" class="icon-move-down"></span>                            </div>':i===t.length-1?o[i].linkOrder='<div class="table-center" style="width:14px">                                <span onclick="admin.categoryList.changeOrder('+t[i].oId+", "+i+', \'up\');" class="icon-move-up"></span>                            </div>':o[i].linkOrder='<div class="table-center" style="width:38px">                                <span onclick="admin.categoryList.changeOrder('+t[i].oId+", "+i+', \'up\');" class="icon-move-up"></span>                                <span onclick="admin.categoryList.changeOrder('+t[i].oId+", "+i+', \'down\');" class="icon-move-down"></span>                            </div>',o[i].categoryTitle=t[i].categoryTitle,o[i].categoryURI=t[i].categoryURI,o[i].categoryDesc=t[i].categoryDescription,o[i].expendRow="<a href='javascript:void(0)' onclick=\"admin.categoryList.get('"+t[i].oId+"')\">"+Label.updateLabel+"</a>                            <a href='javascript:void(0)' onclick=\"admin.categoryList.del('"+t[i].oId+"', '"+encodeURIComponent(t[i].categoryTitle)+"')\">"+Label.removeLabel+"</a> ";g.tablePagination.updateTablePagination(o,n,e.pagination),$("#loadMsg").text("")}else $("#loadMsg").text("")}})},add:function(){if(this.validate()){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text("");var e={categoryTitle:$("#categoryName").val(),categoryTags:$("#categoryTags").val(),categoryURI:$("#categoryURI").val(),categoryDescription:$("#categoryDesc").val()},o=$("#categoryName").data("oId"),a="POST";o&&(e.oId=o,a="PUT"),$.ajax({url:Label.servePath+"/console/category/",type:a,cache:!1,data:JSON.stringify(e),success:function(e,a){if($("#tipMsg").text(e.msg),e.sc){if(!o){admin.categoryList.pageInfo.currentCount===Label.PAGE_SIZE&&admin.categoryList.pageInfo.currentPage===admin.categoryList.pageInfo.pageCount&&admin.categoryList.pageInfo.pageCount++;var t=window.location.hash.split("/");admin.categoryList.pageInfo.pageCount!==parseInt(t[t.length-1])&&admin.setHashByPage(admin.categoryList.pageInfo.pageCount)}$("#categoryName").val("").data("oId",""),$("#categoryTags").val(""),$("#categoryURI").val(""),$("#categoryDesc").val(""),admin.categoryList.getList(admin.categoryList.pageInfo.pageCount),$("#loadMsg").text("")}else $("#loadMsg").text("")}})}},get:function(t){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text(""),$.ajax({url:Label.servePath+"/console/category/"+t,type:"GET",cache:!1,success:function(e,a){$("#tipMsg").text(e.msg),e.sc&&($("#categoryName").val(e.categoryTitle).data("oId",t),$("#categoryURI").val(e.categoryURI),$("#categoryDesc").val(e.categoryDescription),$("#categoryTags").val(e.categoryTags)),$("#loadMsg").text("")}})},del:function(e,a){confirm(Label.confirmRemoveLabel+Label.categoryLabel+'"'+Util.htmlDecode(a)+'"?')&&($("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text(""),$.ajax({url:Label.servePath+"/console/category/"+e,type:"DELETE",cache:!1,success:function(e,a){if($("#tipMsg").text(e.msg),e.sc){var t=admin.categoryList.pageInfo.currentPage;1===admin.categoryList.pageInfo.currentCount&&1!==admin.categoryList.pageInfo.pageCount&&admin.categoryList.pageInfo.currentPage===admin.categoryList.pageInfo.pageCount&&(admin.categoryList.pageInfo.pageCount--,t=admin.categoryList.pageInfo.pageCount);var o=window.location.hash.split("/");t!==parseInt(o[o.length-1])&&admin.setHashByPage(t),admin.categoryList.getList(t),$("#loadMsg").text("")}else $("#loadMsg").text("")}}))},validate:function(e){e||(e="");var a=$("#categoryName"+e).val().replace(/(^\s*)|(\s*$)/g,"");if(a.length<2||32<a.length)$("#tipMsg").text(Label.categoryTooLongLabel),$("#categoryName"+e).focus();else{if(""!==$.trim($("#categoryTags"+e).val()))return!0;$("#tipMsg").text(Label.tagsEmptyLabel),$("#categoryTags"+e).focus()}return!1},changeOrder:function(e,a,t){$("#loadMsg").text(Label.loadingLabel),$("#tipMsg").text("");var o={oId:e.toString(),direction:t};$.ajax({url:Label.servePath+"/console/category/order/",type:"PUT",cache:!1,data:JSON.stringify(o),success:function(e,a){$("#tipMsg").text(e.msg),admin.categoryList.getList(admin.categoryList.pageInfo.currentPage),$("#loadMsg").text("")}})}},admin.register["category-list"]={obj:admin.categoryList,init:admin.categoryList.init,refresh:admin.categoryList.getList};
 admin.commentList={tablePagination:new TablePaginate("comment"),pageInfo:{currentPage:1},init:function(e){this.tablePagination.buildTable([{text:Label.commentContentLabel,index:"content",minWidth:174,style:"padding-left: 12px;"},{text:Label.authorLabel,index:"title",style:"padding-left: 12px;",width:154},{text:Label.dateLabel,index:"date",width:60,style:"padding-left: 12px;"}]),this.tablePagination.initPagination(),this.getList(e)},getList:function(l){var o=this;$("#loadMsg").text(Label.loadingLabel),$.ajax({url:Label.servePath+"/console/comments/"+l+"/"+Label.PAGE_SIZE+"/"+Label.WINDOW_SIZE,type:"GET",cache:!1,success:function(e,t){if($("#tipMsg").text(e.msg),e.sc){o.pageInfo.currentPage=l;for(var a=e.comments,n=[],i=0;i<a.length;i++){n[i]={},n[i].content='<div class="vditor-reset">'+Util.replaceEmString(a[i].commentContent)+"</div><span class='table-tag'> on &nbsp;&nbsp;</span><a href='"+Label.servePath+a[i].commentSharpURL+"' target='_blank'>"+a[i].commentTitle+"</a>",n[i].expendRow="<a href='javascript:void(0)' onclick=\"admin.commentList.del('"+a[i].oId+"', 'Article')\">"+Label.removeLabel+"</a>",n[i].title="<img class='small-head' src='"+a[i].commentThumbnailURL+"'/>","http://"===a[i].commentURL?n[i].title+=a[i].commentName:n[i].title+="<a href='"+a[i].commentURL+"' target='_blank' class='no-underline'>"+a[i].commentName+"</a>",n[i].title+="<br/>",n[i].date=$.bowknot.getDate(a[i].commentTime)}o.tablePagination.updateTablePagination(n,l,e.pagination),Util.parseMarkdown(),Util.parseLanguage(),$("#loadMsg").text("")}else $("#loadMsg").text("")}})},del:function(e,t){confirm(Label.confirmRemoveLabel+Label.commentLabel+"?")&&($("#loadMsg").text(Label.loadingLabel),$.ajax({url:Label.servePath+"/console/"+t.toLowerCase()+"/comment/"+e,type:"DELETE",cache:!1,success:function(e,t){$("#tipMsg").text(e.msg),e.sc&&admin.commentList.getList(admin.commentList.pageInfo.currentPage),$("#loadMsg").text("")}}))}},admin.register["comment-list"]={obj:admin.commentList,init:admin.commentList.init,refresh:admin.commentList.getList};
 var plugins={};admin.plugin={plugins:[],add:function(t){t.isInit=!1,t.hash=t.path.replace("/","#")+"/"+t.id,this.plugins.push(t);var a=this._analysePath(t.path);t.index&&a.length<2&&this._addNew(t,a)},setCurByHash:function(t){for(var a=this.plugins,e=0;e<a.length;e++){var n=a[e],i=this._analysePath(n.path),s=!1;n.index&&-1<window.location.hash.indexOf(n.hash)?s=!0:(n.path.replace("/","#")===window.location.hash||"#main"===window.location.hash&&-1<n.path.indexOf("/main/panel"))&&(s=!0),s&&(n.isInit?plugins[n.id].refresh&&plugins[n.id].refresh(t.page):(n.index?2===i.length&&this._addNew(n,i):this._addToExist(n,i),plugins[n.id].init(t.page),n.isInit=!0))}},_analysePath:function(t){var a=t.split("/");return a.splice(0,1),a},_addNew:function(t,a){if(2===a.length)return t.target=$("#tabPreference li").get(t.index-1),void $("#tabPreference").tabs("add",t);""===a[0]?t.target=$("#tabs>ul>li").get(t.index-1):"article"===a[0]?t.target=$("#tabArticleMgt>li").get(t.index-1):"tools"===a[0]&&(admin.tools.push("#"+t.id),t.target=$("#tabTools>li").get(t.index-1)),t.target||alert("data.index is error!"),$("#tabs").tabs("add",t)},_addToExist:function(t,a){switch(a[0]){case"main":$("#mainPanel"+a[1].charAt(5)).append(t.content);break;case"tools":case"article":2===a.length?$("#tabsPanel_"+a[1]).append(t.content):$("#tabPreferencePanel_"+a[2]).append(t.content);break;case"comment-list":$("#tabsPanel_comment-list").append(t.content)}}};
 admin.main={},admin.register.main={obj:admin.main,init:function(){admin.clearTip()},refresh:function(){admin.clearTip()}};

src/main/webapp/js/admin/categoryList.js

@@ -20,7 +20,7 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.1.3.1, Oct 24, 2018
+ * @version 1.2.0.0, Apr 28, 2019
  * @since 2.0.0
  */
 
@@ -60,14 +60,6 @@ admin.categoryList = {
         this.tablePagination.initPagination();
         this.getList(page);
 
-        $("#categoryUpdate").dialog({
-            title: $("#categoryUpdate").data('title'),
-            width: 700,
-            height: 358,
-            "modal": true,
-            "hideFooter": true
-        });
-
         // For tag auto-completion
         $.ajax({// Gets all tags
             url: Label.servePath + "/console/tags",
@@ -176,9 +168,16 @@ admin.categoryList = {
                 "categoryDescription": $("#categoryDesc").val()
             };
 
+            var oId = $("#categoryName").data("oId");
+            var type = "POST"
+            if (oId) {
+              requestJSONObject.oId = oId
+              type = "PUT"
+            }
+
             $.ajax({
                 url: Label.servePath + "/console/category/",
-                type: "POST",
+                type: type,
                 cache: false,
                 data: JSON.stringify(requestJSONObject),
                 success: function(result, textStatus) {
@@ -188,19 +187,22 @@ admin.categoryList = {
                         return;
                     }
 
-                    $("#categoryName").val("");
-                    $("#categoryTags").val("");
-                    $("#categoryURI").val("");
-                    $("#categoryDesc").val("");
-                    if (admin.categoryList.pageInfo.currentCount === Label.PAGE_SIZE &&
-                            admin.categoryList.pageInfo.currentPage === admin.categoryList.pageInfo.pageCount) {
+                    if (!oId) {
+                      if (admin.categoryList.pageInfo.currentCount === Label.PAGE_SIZE &&
+                        admin.categoryList.pageInfo.currentPage === admin.categoryList.pageInfo.pageCount) {
                         admin.categoryList.pageInfo.pageCount++;
-                    }
-                    var hashList = window.location.hash.split("/");
-                    if (admin.categoryList.pageInfo.pageCount !== parseInt(hashList[hashList.length - 1])) {
+                      }
+                      var hashList = window.location.hash.split("/");
+                      if (admin.categoryList.pageInfo.pageCount !== parseInt(hashList[hashList.length - 1])) {
                         admin.setHashByPage(admin.categoryList.pageInfo.pageCount);
+                      }
                     }
 
+                    $("#categoryName").val("").data("oId", '');
+                    $("#categoryTags").val("");
+                    $("#categoryURI").val("");
+                    $("#categoryDesc").val("");
+
                     admin.categoryList.getList(admin.categoryList.pageInfo.pageCount);
 
                     $("#loadMsg").text("");
@@ -215,7 +217,6 @@ admin.categoryList = {
     get: function(id) {
         $("#loadMsg").text(Label.loadingLabel);
         $("#tipMsg").text("");
-        $("#categoryUpdate").dialog("open");
 
         $.ajax({
             url: Label.servePath + "/console/category/" + id,
@@ -228,51 +229,15 @@ admin.categoryList = {
                     return;
                 }
 
-                $("#categoryNameUpdate").val(result.categoryTitle).data("oId", id);
-                $("#categoryURIUpdate").val(result.categoryURI);
-                $("#categoryDescUpdate").val(result.categoryDescription);
-                $("#categoryTagsUpdate").val(result.categoryTags);
+                $("#categoryName").val(result.categoryTitle).data("oId", id);
+                $("#categoryURI").val(result.categoryURI);
+                $("#categoryDesc").val(result.categoryDescription);
+                $("#categoryTags").val(result.categoryTags);
 
                 $("#loadMsg").text("");
             }
         });
     },
-    /*
-     * 更新分类
-     */
-    update: function() {
-        if (this.validate("Update")) {
-            $("#loadMsg").text(Label.loadingLabel);
-            $("#tipMsg").text("");
-
-            var requestJSONObject = {
-                "categoryTitle": $("#categoryNameUpdate").val(),
-                "oId": $("#categoryNameUpdate").data("oId"),
-                "categoryTags": $("#categoryTagsUpdate").val(),
-                "categoryURI": $("#categoryURIUpdate").val(),
-                "categoryDescription": $("#categoryDescUpdate").val()
-            };
-
-            $.ajax({
-                url: Label.servePath + "/console/category/",
-                type: "PUT",
-                cache: false,
-                data: JSON.stringify(requestJSONObject),
-                success: function(result, textStatus) {
-                    $("#categoryUpdate").dialog("close");
-                    $("#tipMsg").text(result.msg);
-                    if (!result.sc) {
-                        $("#loadMsg").text("");
-                        return;
-                    }
-
-                    admin.categoryList.getList(admin.categoryList.pageInfo.currentPage);
-
-                    $("#loadMsg").text("");
-                }
-            });
-        }
-    },
     /*
      * 删除分类
      * @id 分类 id