Merge branch '1.5.0' into 'release'

1.5.0 See merge request !23
EdgeVerve · Jul 20, 2018 · 032045f · 032045f
2 parents a09ef45 + 4a4008c
commit 032045f
Show file tree

Hide file tree

Showing 44 changed files with 3,012 additions and 375 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -28,7 +28,8 @@ module.exports = function GruntConfig(grunt) {
       coverage: {
         src: [
           'test/*.js',
-          'test/activiti-integeration/*.js'
+          'test/activiti-integeration/*.js',
+          'test/cluster-test/recovery-test.js'
         ],
         options: {
           excludes: [],

diff --git a/common/mixins/lib/maker-checker-helper-v2.js b/common/mixins/lib/maker-checker-helper-v2.js
@@ -21,7 +21,6 @@ exports._endWorkflowRequest = function _endWorkflowRequest(engineType, processId
   var RequestModel;
 
   if (engineType === 'oe-workflow') {
-    // RequestModel = app.models.ChangeWorkflowRequest;
     RequestModel = loopback.getModel('ChangeWorkflowRequest', options);
   } else {
     RequestModel = app.models.Activiti_WorkflowRequest;
@@ -95,6 +94,8 @@ function rejectedDeleteInstance(app, request, options, next) {
   }
   var updates = {
     status: 'complete',
+    verificationStatus: 'rejected',
+    remarks: options.__comments__ || '',
     _verifiedBy: _verifiedBy,
     _version: request._version
   };
@@ -123,6 +124,8 @@ function approvedDeleteInstance(app, request, options, next) {
     }
     var updates = {
       status: 'complete',
+      verificationStatus: 'approved',
+      remarks: options.__comments__ || '',
       _verifiedBy: _verifiedBy,
       _version: request._version
     };
@@ -145,6 +148,8 @@ function rejectedUpdateInstance(app, request, options, next) {
   }
   var updates = {
     status: 'complete',
+    verificationStatus: 'rejected',
+    remarks: options.__comments__ || '',
     _verifiedBy: _verifiedBy,
     _version: request._version
   };
@@ -195,6 +200,8 @@ function approvedUpdateInstance(app, request, wfupdates, options, next) {
       }
       var updates = {
         status: 'complete',
+        verificationStatus: 'approved',
+        remarks: options.__comments__ || '',
         _verifiedBy: _verifiedBy,
         _version: request._version
       };
@@ -218,6 +225,8 @@ function rejectedCreateInstance(app, request, options, next) {
   }
   var updates = {
     status: 'complete',
+    verificationStatus: 'rejected',
+    remarks: options.__comments__ || '',
     _verifiedBy: _verifiedBy,
     _version: request._version
   };
@@ -253,6 +262,8 @@ function approvedCreateInstance(app, request, wfupdates, options, next) {
     }
     var updates = {
       status: 'complete',
+      verificationStatus: 'approved',
+      remarks: options.__comments__ || '',
       _verifiedBy: _verifiedBy,
       _version: request._version
     };