Merge branch feature/workflowgroup of zentao/zentaopms (#11559)

db/update22.0.sql

@@ -66,5 +66,6 @@ UPDATE `zt_review` SET `status` = 'reviewing' WHERE `status` = 'wait';
 ALTER TABLE `zt_object` ADD `status` varchar(20) NOT NULL DEFAULT '' AFTER `type`;
 ALTER TABLE `zt_object` ADD `approval`  mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER `status`;
 ALTER TABLE `zt_object` ADD `reviewResult` varchar(20) NOT NULL DEFAULT '' AFTER `approval`;
+ALTER TABLE `zt_object` ADD `reviewOpinion` text NULL AFTER `reviewResult`;
 ALTER TABLE `zt_object` ADD `reviewers` text NULL AFTER `reviewResult`;
 ALTER TABLE `zt_object` ADD `categoryVersion` text DEFAULT NULL AFTER `category`;

db/zentao.sql

@@ -14317,6 +14317,7 @@ CREATE TABLE IF NOT EXISTS `zt_object` (
   `status` varchar(20) NOT NULL DEFAULT '',
   `approval`  mediumint(8) unsigned NOT NULL DEFAULT '0',
   `reviewResult` varchar(20) NOT NULL DEFAULT '',
+  `reviewOpinion` text NULL,
   `reviewers` text NULL,
   `enabled` enum('0','1') NOT NULL DEFAULT '1',
   `range` text NULL,

lib/zin/wg/backbtn/v1.php

@@ -98,6 +98,7 @@ class backBtn extends btn
             'deploy'         => 'deploy-browse',
             'program'        => 'program-browse,program-productview',
             'workflowgroup'  => 'workflowgroup-project,workflowgroup-deliverable',
+            'cm'             => 'cm-browse,cm-view',
             'deliverable'    => 'deliverable-browse'
         );