diff --git a/module-article/module-article-web/src/main/java/io/jpress/module/article/controller/_ArticleController.java b/module-article/module-article-web/src/main/java/io/jpress/module/article/controller/_ArticleController.java index 3be77a1667e3d75b5f8f62df4554cec655840ff5..a60311da3dcbbdb9dac5730803719dba3a8868b7 100644 --- a/module-article/module-article-web/src/main/java/io/jpress/module/article/controller/_ArticleController.java +++ b/module-article/module-article-web/src/main/java/io/jpress/module/article/controller/_ArticleController.java @@ -250,6 +250,8 @@ public class _ArticleController extends AdminControllerBase { for (ArticleCategory category : categories) { if (category.getId() == id) { setAttr("category", category); + List menus = menuService.findListByRelatives("article_category", id); + setAttr("isDisplayInMenu", menus.size() > 0); } } } @@ -273,6 +275,7 @@ public class _ArticleController extends AdminControllerBase { render("article/tag_list.html"); } + // category添加到menu中 public void doAddCategoryToMenu() { Long id = getIdPara(); @@ -282,6 +285,11 @@ public class _ArticleController extends AdminControllerBase { renderJson(Ret.fail().set("message", "该数据已经被删除")); return; } + List menus = menuService.findListByRelatives("article_category", id); + if (menus.size() > 0) { + renderJson(Ret.fail().set("message", "已添加至菜单,请勿重复添加!")); + return; + } Menu menu = new Menu(); menu.setPid(0l); @@ -296,6 +304,14 @@ public class _ArticleController extends AdminControllerBase { renderOkJson(); } + // 从menu中删除category + public void doRemoveCategoryFromMenu() { + List menus = menuService.findListByRelatives("article_category", getIdPara()); + if (menus.get(0) != null) { + menuService.delete(menus.get(0)); + } + renderOkJson(); + } @EmptyValidate({ diff --git a/module-article/module-article-web/src/main/webapp/WEB-INF/views/admin/article/category_list.html b/module-article/module-article-web/src/main/webapp/WEB-INF/views/admin/article/category_list.html index 0193a2edfc3e71f09816242f3d8a05d0771eae05..3e644e55f78f6a33a1ec259599b84383707bab51 100755 --- a/module-article/module-article-web/src/main/webapp/WEB-INF/views/admin/article/category_list.html +++ b/module-article/module-article-web/src/main/webapp/WEB-INF/views/admin/article/category_list.html @@ -13,11 +13,17 @@ ajaxGet("#(CPATH)/admin/article/doCategoryDel/" + id); }); - $('.addtomenu-action').on('click', function () { + $('#isDisplayInMenu').on('change', function () { var id = $(this).attr("data-id"); - ajaxGet("#(CPATH)/admin/article/doAddCategoryToMenu/" + id,function () { - toastr.success("添加到菜单成功") - }) + if (this.checked) { + ajaxGet("#(CPATH)/admin/article/doAddCategoryToMenu/" + id,function () { + toastr.success("显示到菜单成功") + }) + } else { + ajaxGet("#(CPATH)/admin/article/doRemoveCategoryFromMenu/" + id,function () { + toastr.success("从菜单移除成功") + }) + } }); $(".tflag").each(function () { @@ -141,8 +147,13 @@ - - +
+ +
+ +
+
#if(styles && styles.size() > 0)
@@ -221,7 +232,6 @@
+
+ +
+ +
+
+ #if(styles && styles.size() > 0 )
@@ -153,8 +167,6 @@