admin/ChestnutCMS
1
0
Fork 0
mirror of https://gitee.com/liweiyi/ChestnutCMS.git synced 2025-12-06 16:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: the default value of <@cms_content> attribute status.

Browse Source
This commit is contained in:
liweiyi 2025-08-05 15:44:27 +08:00
parent 24b9fbe5f0
commit c847340220
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/tag/CmsContentTag.java
View File

@ -66,7 +66,6 @@ public class CmsContentTag extends AbstractListTag {
public final static String ATTR_USAGE_HAS_ATTRIBUTE = "{FREEMARKER.TAG." + TAG_NAME + ".hasattribute}"; public final static String ATTR_USAGE_HAS_ATTRIBUTE = "{FREEMARKER.TAG." + TAG_NAME + ".hasattribute}";
public final static String ATTR_USAGE_NO_ATTRIBUTE = "{FREEMARKER.TAG." + TAG_NAME + ".noattribute}"; public final static String ATTR_USAGE_NO_ATTRIBUTE = "{FREEMARKER.TAG." + TAG_NAME + ".noattribute}";
public final static String ATTR_USAGE_STATUS = "{FREEMARKER.TAG." + TAG_NAME + ".status}"; public final static String ATTR_USAGE_STATUS = "{FREEMARKER.TAG." + TAG_NAME + ".status}";
public final static String ATTR_DEFAULT_NO_STATUS = "{FREEMARKER.TAG." + TAG_NAME + ".status.defaultValue}";
public final static String ATTR_USAGE_TOP_FLAG = "{FREEMARKER.TAG." + TAG_NAME + ".topflag}"; public final static String ATTR_USAGE_TOP_FLAG = "{FREEMARKER.TAG." + TAG_NAME + ".topflag}";
public final static String ATTR_CATALOG_ID = "catalogid"; public final static String ATTR_CATALOG_ID = "catalogid";
@ -91,7 +90,7 @@ public class CmsContentTag extends AbstractListTag {
tagAttrs.add(new TagAttr(ATTR_SORT, false, TagAttrDataType.STRING, ATTR_USAGE_SORT, SortTagAttr.toTagAttrOptions(), SortTagAttr.Default.name())); tagAttrs.add(new TagAttr(ATTR_SORT, false, TagAttrDataType.STRING, ATTR_USAGE_SORT, SortTagAttr.toTagAttrOptions(), SortTagAttr.Default.name()));
tagAttrs.add(new TagAttr(ATTR_HAS_ATTRIBUTE, false, TagAttrDataType.STRING, ATTR_USAGE_HAS_ATTRIBUTE)); tagAttrs.add(new TagAttr(ATTR_HAS_ATTRIBUTE, false, TagAttrDataType.STRING, ATTR_USAGE_HAS_ATTRIBUTE));
tagAttrs.add(new TagAttr(ATTR_NO_ATTRIBUTE, false, TagAttrDataType.STRING, ATTR_USAGE_NO_ATTRIBUTE)); tagAttrs.add(new TagAttr(ATTR_NO_ATTRIBUTE, false, TagAttrDataType.STRING, ATTR_USAGE_NO_ATTRIBUTE));
tagAttrs.add(new TagAttr(ATTR_STATUS, false, TagAttrDataType.STRING, ATTR_USAGE_STATUS, ATTR_DEFAULT_NO_STATUS)); tagAttrs.add(new TagAttr(ATTR_STATUS, false, TagAttrDataType.STRING, ATTR_USAGE_STATUS));
tagAttrs.add(new TagAttr(ATTR_TOP_FLAG, false, TagAttrDataType.BOOLEAN, ATTR_USAGE_TOP_FLAG, Boolean.TRUE.toString())); tagAttrs.add(new TagAttr(ATTR_TOP_FLAG, false, TagAttrDataType.BOOLEAN, ATTR_USAGE_TOP_FLAG, Boolean.TRUE.toString()));
return tagAttrs; return tagAttrs;
} }
@ -116,7 +115,7 @@ public class CmsContentTag extends AbstractListTag {
String status = MapUtils.getString(attrs, ATTR_STATUS, ContentStatus.PUBLISHED); String status = MapUtils.getString(attrs, ATTR_STATUS, ContentStatus.PUBLISHED);
LambdaQueryWrapper<CmsContent> q = new LambdaQueryWrapper<>(); LambdaQueryWrapper<CmsContent> q = new LambdaQueryWrapper<>();
q.eq(CmsContent::getSiteId, siteId).eq(!"-1".equals(status), CmsContent::getStatus, ContentStatus.PUBLISHED); q.eq(CmsContent::getSiteId, siteId).eq(!"-1".equals(status), CmsContent::getStatus, status);
if (Objects.nonNull(catalog)) { if (Objects.nonNull(catalog)) {
if (LevelTagAttr.isCurrent(level)) { if (LevelTagAttr.isCurrent(level)) {
q.eq(CmsContent::getCatalogId, catalog.getCatalogId()); q.eq(CmsContent::getCatalogId, catalog.getCatalogId());