Merge branch 'fix/cms.category' into 'develop'

Merge of fix/cms.category 文档发布范围为空时是否全员通知 to develop

See merge request o2oa/o2oa!350

o2web/source/x_component_cms_ColumnManager/CategoryExplorer.js

@@ -782,6 +782,13 @@ MWF.xApplication.cms.ColumnManager.CategoryExplorer.Category = new Class({
             this.app.notice( MWF.xApplication.cms.ColumnManager.LP.setSendNotifySuccess );
         }.bind(this))
     },
+    setBlankToAllNotify: function( value ){
+        var d = this.data;
+        d.blankToAllNotify = value;
+        this.app.restActions.saveCategory(  d, function( json ){
+            this.app.notice( MWF.xApplication.cms.ColumnManager.LP.setBlankToAllNotifySuccess );
+        }.bind(this))
+    },
     setEditForm : function( formId, formName ){
         var d = this.data;
         d.formId = formId;
@@ -2665,6 +2672,7 @@ MWF.xApplication.cms.ColumnManager.CategoryExplorer.CategoryProperty = new Class
         //     html += "<tr><td class='formTitle'>"+this.app.lp.application.icon+"</td><td id='formApplicationIcon'></td></tr>";
         html += "<tr><td class='formTitle'>"+this.app.lp.category.excelImportView +"</td><td class='formValue'><div id='formImportViewId' style='cursor:pointer;width:90%;min-height:22px;overflow:hidden;border:1px solid #ccc;border-radius: 3px;'></div></td></td></tr>"; //(this.category.data.documentType || "" )+
         html += "<tr><td class='formTitle'>"+this.app.lp.category.sendNotify +"</td><td id='formCategorySendNotify' class='formValue'></td></tr>"; //"+this.category.data.categoryAlias+"
+        html += "<tr><td class='formTitle'>"+this.app.lp.category.blankToAllNotify +"</td><td id='formCategoryBlankToAllNotify' class='formValue'></td></tr>"; //"+this.category.data.categoryAlias+"
         html += "</table>";
         this.propertyContentNode.set("html", html);
         this.propertyContentNode.getElements("td.formTitle").setStyles(this.app.css.propertyBaseContentTdTitle);
@@ -2707,6 +2715,22 @@ MWF.xApplication.cms.ColumnManager.CategoryExplorer.CategoryProperty = new Class
         });
         this.sendNotify.load();
 
+        var blankToAllNotifyValue = o2.typeOf(this.category.data.blankToAllNotify) === "boolean" ? this.category.data.blankToAllNotify : true;
+        this.blankToAllNotify = new MDomItem( this.propertyContentNode.getElement("#formCategoryBlankToAllNotify"), {
+            type : "select",
+            style: this.app.css.processSelect,
+            value : blankToAllNotifyValue.toString(),
+            selectValue : lp.blankToAllNotifySelectValue,
+            selectText: lp.blankToAllNotifySelectText,
+            event : {
+                change : function( item ){
+                    this.category.setBlankToAllNotify( item.getValue() !== "false" );
+                }.bind(this)
+            }
+        });
+        this.blankToAllNotify.load();
+
+
         var value = this.category.data.importViewId ? [{
             id : this.category.data.importViewId,
             name : this.category.data.importViewName,

o2web/source/x_component_cms_ColumnManager/lp/en.js

@@ -62,6 +62,7 @@ MWF.xApplication.cms.ColumnManager.LP = {
         "nameLabel": "Category Name",
         "aliasLabel": "Category Alias",
         "sendNotify": "Send Message",
+        "blankToAllNotify": "Notify all when the release range is empty",
         "descriptionLabel": "Category description",
         "sortLabel": "Queue Number",
         "columnLabel": "AppInfo",
@@ -235,6 +236,7 @@ MWF.xApplication.cms.ColumnManager.LP = {
     "setCategoryAliasSuccess": "Set category alias successfully",
     "setDocumentTypeSuccess": "Set the document type successfully",
     "setSendNotifySuccess": "Set Send Messsage successfully",
+    "setBlankToAllNotifySuccess": "Whether the message is sent successfully when the release range is empty",
     "setEditFormSuccess": "Set Edit Form Success",
     "setReadFormSuccess": "Set Read Form Success",
     "setProjectionSuccess": "Set data mapping success",
@@ -262,6 +264,8 @@ MWF.xApplication.cms.ColumnManager.LP = {
     "documentTypeSelectText": ["Information","Data"],
     "sendNotifySelectText": ["yes","no"],
     "sendNotifySelectValue": ["true","false"],
+    "blankToAllNotifySelectText": ["yes","no"],
+    "blankToAllNotifySelectValue": ["true","false"],
     "infor": "Information",
     "data": "Data",
     "type": "Type",

o2web/source/x_component_cms_ColumnManager/lp/zh-cn.js

@@ -62,6 +62,7 @@ MWF.xApplication.cms.ColumnManager.LP = {
         "nameLabel" : "分类名称",
         "aliasLabel" : "分类别名",
         "sendNotify" : "发布时是否发送消息",
+        "blankToAllNotify": "发布范围为空时是否全员通知",
         "descriptionLabel" : "分类描述",
         "sortLabel" : "分类排序",
         "columnLabel" : "所属栏目",
@@ -236,6 +237,7 @@ MWF.xApplication.cms.ColumnManager.LP = {
     "setCategoryAliasSuccess": "设置分类别名成功",
     "setDocumentTypeSuccess": "设置文档类型成功",
     "setSendNotifySuccess": "设置是否发送消息成功",
+    "setBlankToAllNotifySuccess": "设置发布范围为空是否发送消息成功",
     "setEditFormSuccess": "设置编辑表单成功",
     "setReadFormSuccess": "设置阅读表单成功",
     "setProjectionSuccess": "设置数据映射成功",
@@ -263,6 +265,8 @@ MWF.xApplication.cms.ColumnManager.LP = {
     "documentTypeSelectText": ["信息","数据"],
     "sendNotifySelectText": ["是","否"],
     "sendNotifySelectValue": ["true","false"],
+    "blankToAllNotifySelectText": ["是","否"],
+    "blankToAllNotifySelectValue": ["true","false"],
     "infor": "信息",
     "data": "数据",
     "type": "类型",