ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.2' into 5.2

This commit is contained in:
wujj 2020-10-21 15:51:39 +08:00
parent 40c6f9bea2 2539a73dd4
commit 1edf89e4af
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/5.2-patch.sql Normal file
View File

File diff suppressed because one or more lines are too long

6
src/main/webapp/WEB-INF/manager/cms/category/form.ftl
View File

@ -542,10 +542,10 @@
this.form.id = ms.util.getParameter("id");
this.form.childId = ms.util.getParameter("childId");// 判断是否增加子栏目
// 判断三种状态，默认为编辑状态
// 判断三种状态，默认为新增状态
this.categoryTypeDisabled = false;// 控制栏目分类是否可编辑
if (this.form.id != undefined && this.form.childId == undefined) {
// 切换新增状态，id&childId 为空
if (this.form.id != undefined && (this.form.childId == undefined || this.form.childId == "undefined")) {
// 切换编辑状态，id不为空 childId 为空
this.categoryTypeDisabled = true;
this.get(this.form.id);
} else if (this.form.childId) {