Merge branch 'cherry-pick-368943f4' into 'develop'

Merge branch 'fix/attachment_config_setting_execptiong' into 'wrdp'

See merge request o2oa/o2oa!1278

o2web/source/o2_core/o2/widget/AttachmentController.js

@@ -718,7 +718,7 @@ o2.widget.AttachmentController = o2.widget.ATTER  = new Class({
 
                     if( !att.data.person && att.data.creatorUid )att.data.person = att.data.creatorUid;
 
-                    if ((!att.data.control.allowControl || !att.data.control.allowEdit) && att.data.person!==user){
+                    if ((!att.data.control.allowControl ) && att.data.person!==user){ //|| !att.data.control.allowEdit
                         flag = false;
                     }
                 }

o2web/source/x_component_process_Xform/Attachment.js

@@ -437,7 +437,7 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
                 var att = this.attachments[i];
                 if (!att.data.person && att.data.creatorUid) att.data.person = att.data.creatorUid;
 
-                if ((!att.data.control.allowControl || !att.data.control.allowEdit) && att.data.person !== user) {
+                if ((!att.data.control.allowControl) && att.data.person !== user) { // || !att.data.control.allowEdit
                     flag = false;
                 }
                 if (flag) {
@@ -752,6 +752,7 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
                 o2.Actions.get("x_processplatform_assemble_surface").configAttachment(att.data.id, this.module.form.businessData.work.id, att.data, function () {
                     //刷新附件权限，以后要加一个刷新附件的功能
                     o2.Actions.load("x_processplatform_assemble_surface").AttachmentAction.getWithWorkOrWorkCompleted(att.data.id, this.module.form.businessData.work.id, function (json) {
+                        debugger;
                         var attachment = this.getAttachmentById( att.data.id );
                         if( attachment ){
                             attachment.data = json.data;