Merge branch 'fix/cms_notify' into 'develop'

Merge of fix/cms_notify to develop

See merge request o2oa/o2oa!399

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

@@ -53,10 +53,10 @@ MWF.xApplication.cms.FormDesigner.LP = Object.merge( {}, MWF.xApplication.proces
         "notice" : "消息",
         "noticeInfo": "注：消息发送的总开关在分类配置中设置。",
         "noticeRange": "范围",
-        "noticeByReader": "根据读者（发布范围）",
+        "noticeByReader": "根据阅读范围",
         "noticeByCustom": "自定义",
         "notifyCreatePerson": "通知创建人",
-        "blankToAllNotify": "读者（发布范围）为空时通知可见范围",
+        "blankToAllNotify": "读者（发布范围）为空时通知阅读范围",
         "blankNotToAllNotify": "读者（发布范围）为空时不通知",
         "specificValue": "指定",
         "formField": "表单字段"

o2web/source/x_component_cms_Xform/Form.js

@@ -1159,15 +1159,23 @@ MWF.xApplication.cms.Xform.Form = MWF.CMSForm = new Class(
                 sendOptions = {
                     documentId: this.businessData.document.id,
                     notifyPersonList: rangeList,
+                    notifyByDocumentReadPerson: true,
                     notifyCreatePerson: this.json.notifyCreatePerson !== "no"
                 };
             }
         }
-        if( sendOptions ){
-            o2.Actions.load("x_cms_assemble_control").DocumentAction.publishNotify( this.businessData.document.id, sendOptions, function () {
-                if(callback)callback();
+        if( !sendOptions && this.json.notifyCreatePerson !== "no" ){
+            sendOptions = {
+                documentId: this.businessData.document.id,
+                notifyByDocumentReadPerson: false,
+                notifyCreatePerson: true
+            };
+        }
+        if( sendOptions ) {
+            o2.Actions.load("x_cms_assemble_control").DocumentAction.publishNotify(this.businessData.document.id, sendOptions, function () {
+                if (callback) callback();
             }, function () {
-                if(callback)callback();
+                if (callback) callback();
             })
         }else{
             if(callback)callback();