From 79a38cc9ad130523aa9b340b5ce42f02a80b3358 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Mon, 7 Mar 2022 13:04:06 +0800
Subject: [PATCH] * Fix bug.

---
 db/update16.4.sql                               |  3 +++
 extension/lite/block/ext/config/lite.php        |  2 --
 extension/lite/task/ext/control/batchcreate.php | 10 +++++++++-
 extension/lite/task/ext/control/create.php      | 10 +++++++++-
 .../lite/task/ext/view/batchcreate.html.php     |  4 ++--
 module/block/control.php                        |  2 +-
 module/kanban/model.php                         | 17 +++++++++++++++++
 module/user/view/batchcreate.html.php           |  2 +-
 8 files changed, 42 insertions(+), 8 deletions(-)
 delete mode 100644 extension/lite/block/ext/config/lite.php

diff --git a/db/update16.4.sql b/db/update16.4.sql
index 2f2265fb9c..52133e1dd2 100644
--- a/db/update16.4.sql
+++ b/db/update16.4.sql
@@ -24,3 +24,6 @@ ALTER TABLE `zt_task` MODIFY `activatedDate` datetime NOT NULL AFTER `lastEdited
 
 ALTER TABLE `zt_user` ADD `visions` varchar(20) NOT NULL AFTER `visits`;
 UPDATE `zt_user` SET `visions`='rnd,lite';
+
+INSERT INTO `zt_group` (`vision`, `name`, `role`, `desc`) VALUES
+('lite', '迅捷版用户分组', 'liteUser', '迅捷版用户分组');
diff --git a/extension/lite/block/ext/config/lite.php b/extension/lite/block/ext/config/lite.php
deleted file mode 100644
index 60ccd32b16..0000000000
--- a/extension/lite/block/ext/config/lite.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$config->block->closed = '|html,|contribute';
diff --git a/extension/lite/task/ext/control/batchcreate.php b/extension/lite/task/ext/control/batchcreate.php
index 713dc26da6..7444e398de 100644
--- a/extension/lite/task/ext/control/batchcreate.php
+++ b/extension/lite/task/ext/control/batchcreate.php
@@ -11,7 +11,15 @@ class myTask extends task
             die(js::locate(helper::createLink('execution', 'create')));
         }
 
-        $regionList = $this->loadModel('kanban')->getRegionPairs($executionID, 0, 'execution');
+        $regionList   = $this->loadModel('kanban')->getRegionPairs($executionID, 0, 'execution');
+        $regionIDList = array_keys($regionList);
+
+        /* Filter Kanban without Lane. */
+        $lanes = $this->kanban->getLaneGroupByRegion($regionIDList, 'task');
+        foreach($regionList as $key => $region)
+        {
+            if(!isset($lanes[$key])) unset($regionList[$key]);
+        }
 
         $this->view->regionList = $regionList;
         $this->view->extra      = $extra;
diff --git a/extension/lite/task/ext/control/create.php b/extension/lite/task/ext/control/create.php
index ae73290144..d6cf3ae80b 100644
--- a/extension/lite/task/ext/control/create.php
+++ b/extension/lite/task/ext/control/create.php
@@ -11,7 +11,15 @@ class myTask extends task
             die(js::locate(helper::createLink('execution', 'create')));
         }
 
-        $regionList = $this->loadModel('kanban')->getRegionPairs($executionID, 0, 'execution');
+        $regionList   = $this->loadModel('kanban')->getRegionPairs($executionID, 0, 'execution');
+        $regionIDList = array_keys($regionList);
+
+        /* Filter Kanban without Lane. */
+        $lanes = $this->kanban->getLaneGroupByRegion($regionIDList, 'task');
+        foreach($regionList as $key => $region)
+        {
+            if(!isset($lanes[$key])) unset($regionList[$key]);
+        }
 
         $this->view->regionList = $regionList;
         $this->view->laneList   = array();
diff --git a/extension/lite/task/ext/view/batchcreate.html.php b/extension/lite/task/ext/view/batchcreate.html.php
index 8bf5d597eb..0c007da870 100644
--- a/extension/lite/task/ext/view/batchcreate.html.php
+++ b/extension/lite/task/ext/view/batchcreate.html.php
@@ -141,7 +141,7 @@
               <div class='input-group'>
                 <?php
                 echo html::input("estStarted[$i]", '', "class='form-control text-center form-date' onkeyup='toggleCheck(this)'");
-                if($i != 0) echo "<span class='input-group-addon estStartedBox'><input type='checkbox' name='estStartedDitto[$i]' id='estStartedDitto$i' " . ($i> 0 ? "checked" : '') . " /> {$lang->task->ditto}</span>";
+                if($i != 1) echo "<span class='input-group-addon estStartedBox'><input type='checkbox' name='estStartedDitto[$i]' id='estStartedDitto$i' " . ($i > 1 ? "checked" : '') . " /> {$lang->task->ditto}</span>";
                 ?>
               </div>
             </td>
@@ -149,7 +149,7 @@
               <div class='input-group'>
                 <?php
                 echo html::input("deadline[$i]", '', "class='form-control text-center form-date' onkeyup='toggleCheck(this)'");
-                if($i != 0) echo "<span class='input-group-addon deadlineBox'><input type='checkbox' name='deadlineDitto[$i]' id='deadlineDitto$i' " . ($i> 0 ? "checked" : '') . " /> {$lang->task->ditto}</span>";
+                if($i != 1) echo "<span class='input-group-addon deadlineBox'><input type='checkbox' name='deadlineDitto[$i]' id='deadlineDitto$i' " . ($i > 0 ? "checked" : '') . " /> {$lang->task->ditto}</span>";
                 ?>
               </div>
             </td>
diff --git a/module/block/control.php b/module/block/control.php
index abd4612bd2..c0907e5f45 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -68,7 +68,7 @@ class block extends control
             if(strpos(",$closedBlock,", ",|flowchart,") === false and $this->config->global->flow == 'full') $modules['flowchart'] = $this->lang->block->lblFlowchart;
             if(strpos(",$closedBlock,", ",|welcome,") === false and $this->config->global->flow == 'full') $modules['welcome'] = $this->lang->block->welcome;
             if(strpos(",$closedBlock,", ",|html,") === false) $modules['html'] = 'HTML';
-            if(strpos(",$closedBlock,", ",|contribute,") === false) $modules['contribute'] = $this->lang->block->contribute;
+            if(strpos(",$closedBlock,", ",|contribute,") === false and $this->config->vision == 'rnd') $modules['contribute'] = $this->lang->block->contribute;
             $modules = array('' => '') + $modules;
 
             $hiddenBlocks = $this->block->getHiddenBlocks();
diff --git a/module/kanban/model.php b/module/kanban/model.php
index b2fec43d2c..ed22e85d88 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1840,6 +1840,23 @@ class kanbanModel extends model
             ->fetchPairs();
     }
 
+    /**
+     * Get lane by region id.
+     *
+     * @param  array  $regionID
+     * @param  string $type all|story|task|bug|common
+     * @access public
+     * @return array
+     */
+    public function getLaneGroupByRegion($regionID, $type = 'all')
+    {
+        return $this->dao->select('*')->from(TABLE_KANBANLANE)
+            ->where('deleted')->eq('0')
+            ->andWhere('region')->in($regionID)
+            ->beginIF($type != 'all')->andWhere('type')->eq($type)->fi()
+            ->fetchGroup('region');
+    }
+
     /**
      * Create a lane.
      *
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 01e30f989c..b162070ae3 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -80,7 +80,7 @@
           <td class='text-left<?php echo zget($visibleFields, 'dept', ' hidden')?>' style='overflow:visible'><?php echo html::select("dept[$i]", $depts, $i > 0 ? 'ditto' : $deptID, "class='form-control chosen'");?></td>
           <td><?php echo html::input("account[$i]", '', "class='form-control account_$i' onchange='changeEmail($i)'");?></td>
           <td><?php echo html::input("realname[$i]", '', "class='form-control'");?></td>
-          <td class='text-left'><?php echo html::select("visions[$i][]", $visionList, $i > 0 ? 'ditto' : '', "class='form-control chosen' multiple");?></td>
+          <td class='text-left'><?php echo html::select("visions[$i][]", $visionList, $i > 0 ? 'ditto' : key($visionList), "class='form-control chosen' multiple");?></td>
           <td><?php echo html::select("role[$i]", $lang->user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?></td>
           <td class='text-left' style='overflow:visible'><?php echo html::select("group[$i]", $groupList, $i > 0 ? 'ditto' : '', "class='form-control chosen'");?></td>
           <td <?php echo zget($visibleFields, 'email', "class='hidden'")?>><?php echo html::input("email[$i]", '', "class='form-control email_$i' onchange='setDefaultEmail($i)'");?></td>