Merge remote-tracking branch 'origin/V4.0' into V5

sanluan · sanluan · commit 61d1867c10c2 · 2025-11-16T11:42:11.000+08:00
diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/component/template/TemplateComponent.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/component/template/TemplateComponent.java
@@ -252,6 +252,7 @@ public boolean createContentFile(SysSite site, CmsContent entity, CmsCategory ca
                         contentService.updateUrl(entity.getId(), quote.getUrl(), false);
                     }
                 }
+                return true;
             } else {
                 if (null == category) {
                     category = categoryService.getEntity(entity.getCategoryId());
@@ -260,14 +261,15 @@ public boolean createContentFile(SysSite site, CmsContent entity, CmsCategory ca
                     categoryModel = categoryModelService
                             .getEntity(new CmsCategoryModelId(entity.getCategoryId(), entity.getModelId()));
                 }
-                CmsModel model = modelComponent.getModel(site, entity.getModelId());
-                if (null != categoryModel && null != category && null != model) {
+
+                if (null != categoryModel && null != category) {
                     String contentPath = null;
                     String templatePath = null;
                     if (categoryModel.isCustomContentPath()) {
                         contentPath = categoryModel.getContentPath();
                         templatePath = categoryModel.getTemplatePath();
                     } else {
+                        CmsModel model = modelComponent.getModel(site, entity.getModelId());
                         templatePath = model.getTemplatePath();
                         if (category.isCustomContentPath()) {
                             contentPath = category.getContentPath();
@@ -391,7 +393,7 @@ public void createContentFile(SysSite site, List<Serializable> idList, CmsCatego
 
     /**
      * 生成页面片段路径
-     * 
+     *
      * @param filepath
      * @param category
      * @param model
@@ -640,7 +642,7 @@ public Configuration getTaskConfiguration() {
 }
 
 /**
- * 
+ *
  * PublishTask 静态化线程
  *
  */
diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/cms/CmsCategoryDirective.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/cms/CmsCategoryDirective.java
@@ -74,7 +74,7 @@ public void execute(RenderHandler handler) throws IOException, TemplateException
                     CmsUrlUtils.initCategoryUrl(site, entity);
                 }
                 if (containsAttribute) {
-                    entity.setAttribute(ExtendUtils.getAttributeMap(attributeService.getEntity(id)));
+                    entity.setAttribute(ExtendUtils.getAttributeMap(attributeService.getEntity(entity.getId())));
                 }
                 handler.put("object", entity);
                 handler.render();
diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/sys/SysDeptDirective.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/sys/SysDeptDirective.java
@@ -47,9 +47,15 @@ public class SysDeptDirective extends AbstractTemplateDirective {
     @Override
     public void execute(RenderHandler handler) throws IOException, TemplateException {
         Integer id = handler.getInteger("id");
+        String code = handler.getString("code");
         SysSite site = getSite(handler);
-        if (CommonUtils.notEmpty(id)) {
-            SysDept entity = service.getEntity(id);
+        if (CommonUtils.notEmpty(id) || CommonUtils.notEmpty(code)) {
+            SysDept entity;
+            if (CommonUtils.notEmpty(id)) {
+                entity = service.getEntity(id);
+            } else {
+                entity = service.getEntityByCode(site.getId(), code);
+            }
             if (null != entity && site.getId() == entity.getSiteId()) {
                 handler.put("object", entity).render();
             }
diff --git a/publiccms-parent/publiccms/src/main/resources/language/page_en.properties b/publiccms-parent/publiccms/src/main/resources/language/page_en.properties
@@ -252,6 +252,7 @@ page.content.parent.url=Parent content URL
 page.content.parent=Parent content
 page.content.please_select=Please select content
 page.content.promulgator=Promulgator
+page.content.quote=Quote
 page.content.score=Score
 page.content.search=Content search
 page.content.select=Select content
@@ -383,7 +384,6 @@ page.extend_field.use.place=Call with the recommendation data extension place.at
 page.extend_field=Extension field
 page.facet_search=Facet search
 page.fail=Fail
-page.field.source=Source field
 page.field.source_url=Source URL field
 page.field.title=Title field
 page.field.url=URL field
diff --git a/publiccms-parent/publiccms/src/main/resources/language/page_ja.properties b/publiccms-parent/publiccms/src/main/resources/language/page_ja.properties
@@ -252,6 +252,7 @@ page.content.parent.url=\u89AA\u30B3\u30F3\u30C6\u30F3\u30C4URL
 page.content.parent=\u89AA\u30B3\u30F3\u30C6\u30F3\u30C4
 page.content.please_select=\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
 page.content.promulgator=\u767A\u884C\u8005
+page.content.quote=\u5F15\u7528
 page.content.score=\u30B9\u30B3\u30A2
 page.content.search=\u30B3\u30F3\u30C6\u30F3\u30C4\u691C\u7D22
 page.content.select=\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u9078\u629E
@@ -383,7 +384,6 @@ page.extend_field.use.place=\u63A8\u5968\u30D3\u30C3\u30C8\u3092\u4F7F\u7528\u30
 page.extend_field=\u62E1\u5F35\u30D5\u30A3\u30FC\u30EB\u30C9
 page.facet_search=\u30D5\u30A1\u30BB\u30C3\u30C8\u691C\u7D22
 page.fail=\u5931\u6557
-page.field.source=\u30BD\u30FC\u30B9\u30D5\u30A3\u30FC\u30EB\u30C9
 page.field.source_url=\u30BD\u30FC\u30B9\u30B5\u30A4\u30C8\u30D5\u30A3\u30FC\u30EB\u30C9
 page.field.title=\u30BF\u30A4\u30C8\u30EB\u30D5\u30A3\u30FC\u30EB\u30C9
 page.field.url=\u30EA\u30F3\u30AF\u30D5\u30A3\u30FC\u30EB\u30C9
diff --git a/publiccms-parent/publiccms/src/main/resources/language/page_zh.properties b/publiccms-parent/publiccms/src/main/resources/language/page_zh.properties
@@ -252,6 +252,7 @@ page.content.parent.url=\u7236\u5185\u5BB9URL
 page.content.parent=\u7236\u5185\u5BB9
 page.content.please_select=\u8BF7\u9009\u62E9\u5185\u5BB9
 page.content.promulgator=\u53D1\u5E03\u8005
+page.content.quote=\u5F15\u7528
 page.content.score=\u5206\u6570
 page.content.search=\u5185\u5BB9\u641C\u7D22
 page.content.select=\u9009\u62E9\u5185\u5BB9
@@ -383,7 +384,6 @@ page.extend_field.use.place=\u4F7F\u7528\u63A8\u8350\u4F4D\u6269\u5C55\u5C5E\u60
 page.extend_field=\u6269\u5C55\u5B57\u6BB5
 page.facet_search=\u5206\u9762\u641C\u7D22
 page.fail=\u5931\u8D25
-page.field.source=\u6765\u6E90\u5B57\u6BB5
 page.field.source_url=\u6765\u6E90\u7F51\u5740\u5B57\u6BB5
 page.field.title=\u6807\u9898\u5B57\u6BB5
 page.field.url=\u94FE\u63A5\u5B57\u6BB5
diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsContent/add.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsContent/add.html
@@ -87,8 +87,8 @@
 $('input[name=\'categoryName\']',navTab.getCurrentPanel()).on('change',function(){
     addCategory($('input[name=\'quoteCategoryId\']',navTab.getCurrentPanel()).val(), $(this).val(), null);
 });
-<#if a?has_content>
-<@cms.contentQuoteList quoteId=a.id>
+<#if id?has_content>
+<@cms.contentQuoteList quoteId=id>
     <#list list as a>
     <@cms.category id=a.categoryId>
     addCategory('${a.categoryId}','${object.name}','${a.id}');
@@ -118,9 +118,10 @@
                     <#else>
                         <input name="sort" type="hidden" value="${(a.sort)!0}"/>
                     </#if>
+                    <#if a.quoteContentId?has_content && !a.parentId?has_content><san class="statusText orange"><@t.page "content.quote"/></span></#if>
                     </dd>
                 </dl>
-                <dl class="copied hide">
+                <dl<#if !fieldList?seq_contains('source')> class="copied hide"</#if>>
                     <dt>${(model.fieldTextMap['source'])!}:</dt>
                     <dd><input name="source" autocomplete="on" type="text"<#if requiredFieldList?seq_contains('source')> data-required="true"</#if> maxlength="50" size="20" value="${(attribute.source)!}"/></dd>
                 </dl>
@@ -313,10 +314,10 @@
 $('input[name=copied]',navTab.getCurrentPanel()).on("click", function(){
     if($(this).is(':checked')) {
         $('.copied',navTab.getCurrentPanel()).show();
-        $('.copied input[data-required=true]',navTab.getCurrentPanel()).addClass('required');
+        $('input[data-copied-required=true]',navTab.getCurrentPanel()).addClass('required');
     } else {
         $('.copied',navTab.getCurrentPanel()).hide();
-        $('.copied input[data-required=true]',navTab.getCurrentPanel()).removeClass('required').val('');
+        $('input[data-copied-required=true]',navTab.getCurrentPanel()).removeClass('required').val('');
     }
 });
     <#if a?has_content && a.copied>
diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsContent/content_list.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsContent/content_list.html
@@ -196,6 +196,7 @@ <h3>
                             ${(a.copied?then('['+t.pageMessage('copied')+']',''))!}
                             <a href="cmsContent/view.html?id=${a.id}" class="exclude-translate" target="dialog" rel="viewContent${a.id}" width="1200" height="600">${(a.title)!}</a>
                             <#if a.url?has_content><a href="${a.url!}" target="_blank"><i class="icon-external-link"></i></a></#if>
+                            <#if a.quoteContentId?has_content && !a.parentId?has_content><span class="statusText orange"><@t.page "content.quote"/></span></#if>
                         </h3>
                         <p>
                             <#if modelMap[a.modelId]?has_content&&modelMap[a.modelId].hasChild>
diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsContent/uncheck_list.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsContent/uncheck_list.html
@@ -115,7 +115,8 @@ <h3>
                             </#if>
                             [<span class="exclude-translate">${(categoryMap[a.categoryId?string].name)!}</span>]
                             ${(a.copied?then('['+t.pageMessage('copied')+']',''))!}
-                            <a href="cmsContent/view.html?id=${a.id}" class="exclude-translate" target="dialog" width="1200" height="600" rel="viewContent${a.id}">${(a.title)!}</a>
+                            <a href="cmsContent/view.html?id=${a.id}" class="exclude-translate" target="dialog" width="1200" height="600" rel="viewContent${a.id}">${(a.title)!}</a>                            
+                            <#if a.quoteContentId?has_content && !a.parentId?has_content><span class="statusText orange"><@t.page "content.quote"/></span></#if>
                         </h3>
                         <p>
                             <#if modelMap[a.modelId]?has_content&&modelMap[a.modelId].hasChild>
diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsModel/add.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsModel/add.html
diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/myself/contentList.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/myself/contentList.html
diff --git a/publiccms-parent/publiccms/src/main/webapp/resource/css/core.css b/publiccms-parent/publiccms/src/main/webapp/resource/css/core.css

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public void execute(RenderHandler handler) throws IOException, TemplateException`
`74`	`74`	`CmsUrlUtils.initCategoryUrl(site, entity);`
`75`	`75`	`}`
`76`	`76`	`if (containsAttribute) {`
`77`		`- entity.setAttribute(ExtendUtils.getAttributeMap(attributeService.getEntity(id)));`
	`77`	`+ entity.setAttribute(ExtendUtils.getAttributeMap(attributeService.getEntity(entity.getId())));`
`78`	`78`	`}`
`79`	`79`	`handler.put("object", entity);`
`80`	`80`	`handler.render();`