Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_admin_refactors

db/update18.1.sql

@@ -4,6 +4,7 @@ update `zt_task` set `assignedTo` = '' where `mode` = 'multi' and `status` != 'd
 
 REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'scrumClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' ORDER BY id ASC;
 REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'agileplusClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' ORDER BY id ASC;
+REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'waterfallplusClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' ORDER BY id ASC;
 
 UPDATE `zt_project` AS parent INNER JOIN (select `id`,`parent`,`attribute` from `zt_project` where `parent` != 0 and `type` = 'stage') AS child ON parent.`id` = child.`parent` SET parent.`attribute`='mix' where parent.`grade`=1 and parent.`type`='stage' and parent.`attribute` != child.`attribute`;
 
@@ -20,3 +21,7 @@ REPLACE INTO `zt_stage` (`name`,`percent`,`type`, `projectType`, `createdBy`,`cr
 ('发布','10','release','waterfallplus','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
 ('总结评审','5','review','waterfallplus','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0');
 
+ALTER table `zt_reviewcl` ADD `type` varchar(255) NOT NULL DEFAULT '' AFTER `category`;
+UPDATE `zt_reviewcl` SET `type` = 'waterfall' WHERE `type` = '';
+
+UPDATE `zt_activity` SET `order` = `id` * 5 WHERE `order` = '0';

db/zentao.sql

@@ -1488,6 +1488,7 @@ CREATE TABLE IF NOT EXISTS `zt_stage` (
   `name` varchar(255) NOT NULL,
   `percent` varchar(255) NOT NULL,
   `type` varchar(255) NOT NULL,
+  `projectType` varchar(255) NOT NULL,
   `createdBy` varchar(30) NOT NULL,
   `createdDate` datetime NOT NULL,
   `editedBy` varchar(30) NOT NULL,
@@ -6397,7 +6398,7 @@ REPLACE INTO `zt_stage` (`name`,`percent`,`type`,`projectType`,`createdBy`,`crea
 ('开发','50','dev','waterfall','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
 ('测试','15','qa','waterfall','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
 ('发布','10','release','waterfall','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
-('总结评审','5','review','waterfall','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0');
+('总结评审','5','review','waterfall','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0'),
 ('需求','10','request','waterfallplus','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
 ('设计','10','design','waterfallplus','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
 ('开发','50','dev','waterfallplus','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
@@ -9707,6 +9708,7 @@ CREATE TABLE IF NOT EXISTS `zt_reviewcl` (
   `title` varchar(255) NOT NULL,
   `object` char(30) NOT NULL,
   `category` char(30) NOT NULL,
+  `type` varchar(255) NOT NULL,
   `assignedTo` varchar(30) NOT NULL,
   `order` mediumint(8) DEFAULT '0',
   `status` varchar(30) NOT NULL,

extension/lite/group/ext/lang/resource.php

@@ -649,7 +649,7 @@ $lang->resource->custom = new stdclass();
 $lang->resource->custom->index              = 'index';
 $lang->resource->custom->set                = 'set';
 $lang->resource->custom->product            = 'productName';
-$lang->resource->custom->execution          = 'execution';
+$lang->resource->custom->execution          = 'executionCommon';
 $lang->resource->custom->required           = 'required';
 $lang->resource->custom->restore            = 'restore';
 $lang->resource->custom->flow               = 'flow';

module/admin/lang/menu.php

@@ -186,8 +186,11 @@ if($config->edition != 'max')
 if(!helper::hasFeature('waterfall'))
 {
     unset($lang->admin->menuList->model['subMenu']['waterfall']);
-    unset($lang->admin->menuList->model['subMenu']['waterfallplus']);
     unset($lang->admin->menuList->model['menuOrder']['15']);
+}
+if(!helper::hasFeature('waterfallplus'))
+{
+    unset($lang->admin->menuList->model['subMenu']['waterfallplus']);
     unset($lang->admin->menuList->model['menuOrder']['25']);
 }
 if($config->edition == 'max')

module/execution/js/common.js

@@ -177,9 +177,6 @@ function loadBranches(product)
             disableSelectedProduct();
         }
 
-        var branch = $('#branch' + index);
-        loadPlans(product, branch);
-
         if(typeof isStage != 'undefined' && isStage == true)
         {
             $tableRow.find("select[name^='branch'] option").attr('selected', 'selected');
@@ -187,6 +184,9 @@ function loadBranches(product)
             $tableRow.find("div[id^='branch']").addClass('chosen-disabled');
         }
     });
+
+    var branch = $('#branch' + index);
+    loadPlans(product, branch);
 }
 
 /**

module/product/model.php

@@ -1443,11 +1443,11 @@ class productModel extends model
         $hasWaterfall = false;
         foreach($projects as $project)
         {
-            if($project->model == 'waterfall') $hasWaterfall = true;
+            if(in_array($project->model, array('waterfall', 'waterfallplus'))) $hasWaterfall = true;
         }
         $orderBy = $hasWaterfall ? 't2.begin_asc,t2.id_asc' : 't2.begin_desc,t2.id_desc';
 
-        $executions = $this->dao->select('t2.id,t2.name,t2.grade,t2.path,t2.parent,t2.attribute,t2.multiple,t3.name as projectName')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+        $executions = $this->dao->select('t2.id,t2.name,t2.project,t2.grade,t2.path,t2.parent,t2.attribute,t2.multiple,t3.name as projectName')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project = t2.id')
             ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t2.project = t3.id')
             ->where('t1.product')->eq($productID)

module/project/view/create.html.php

@@ -48,11 +48,7 @@
       <h2><?php echo $createTitle;?></h2>
       <?php if(!commonModel::isTutorialMode()): ?>
       <div class="pull-right btn-toolbar">
-      <?php if($config->edition != 'max' or $model == 'kanban'):?>
-        <button type='button' class='btn btn-link' data-toggle='modal' data-target='#copyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>
-      <?php else: ?>
         <button type='button' class='btn btn-link open-btn' data-toggle='modal' data-target='#maxCopyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>
-      <?php endif; ?>
       </div>
       <?php endif; ?>
     </div>