Merge branch 'sgm_kanbanwip'

db/update17.1.sql

@@ -5,4 +5,5 @@ CREATE TABLE `zt_riskissue` (
   UNIQUE KEY `risk_issue` (`risk`,`issue`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+ALTER TABLE `zt_kanban` ADD `showWIP` enum('0','1') NOT NULL DEFAULT '1' AFTER `displayCards`;
 ALTER TABLE `zt_kanban` ADD `alignment` varchar(10) NOT NULL DEFAULT 'center' AFTER `object`;

lib/feishuapi/feishuapi.class.php

@@ -158,7 +158,7 @@ class feishuapi
         $index     = 0;
         while(true)
         {
-            $response = $this->queryAPI($this->apiUrl . "contact/v3/departments?parent_department_id={$departmentID}" . ($pageToken ? "&page_token={$pageToken}" : '') . "&fetch_child=true&page_size=50", '', array(CURLOPT_CUSTOMREQUEST => "GET"));
+            $response = $this->queryAPI($this->apiUrl . "contact/v3/departments?parent_department_id={$departmentID}" . ($pageToken ? "&page_token={$pageToken}" : '') . "&fetch_child=false&page_size=50", '', array(CURLOPT_CUSTOMREQUEST => "GET"));
             if(isset($response->data->items))
             {
                 foreach($response->data->items as $key => $dept)

module/block/view/welcome.html.php

@@ -24,7 +24,7 @@
 .block-welcome.block-sm .col-right .tiles {border-left: none; padding-left: 0}
 .block-welcome.block-sm .tile-title {font-size: 12px; margin: 0 -10px;}
 .block-welcome .progress-group{margin-top: 42px;}
-.block-welcome .progress{margin-top: 10px; width: 85%}
+.block-welcome .progress{margin-top: 10px; width: 85%;}
 .block-welcome .user-welcome{margin-top: 28px !important;}
 .block-welcome .col-right{border-left: 1px solid #e5e8ec;}
 .block-welcome.block-sm .col-right {border: none;}
@@ -32,6 +32,7 @@
 .block-welcome .done-progress{display: inline-block; color: #5B606E; font-weight: 500;}
 .block-welcome .welcome-label{background: #ffebee; border: none;}
 .block-welcome.block-sm .left-today {margin-left: 0px;}
+.block-welcome .progress-num{display: flex; justify-content: space-between; width: 85%;}
 </style>
 <?php $progress = $tasks == 0 ? 0 : round($doneTasks / $tasks, 3) * 100;?>
 <div class='panel-move-handler'></div>
@@ -41,10 +42,12 @@
       <h4><small class="text-muted"><?php echo date(DT_DATE3)?></small></h4>
       <h4 class="user-welcome"><?php printf($lang->block->welcomeList[$welcomeType], $app->user->realname)?></h4>
       <div class="progress-group">
-        <span class="progress-num">
-          <strong><?php echo $lang->block->assignToMe;?></strong>
+        <div class="progress-num">
+          <div>
+            <strong><?php echo $lang->block->assignToMe;?></strong>
+          </div>
           <div class="done-progress"><?php echo $lang->block->done . " $progress" . '%';?></div>
-        </span>
+        </div>
         <div class="progress">
           <div class="progress-bar" role="progressbar" aria-valuenow="82" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $progress;?>%">
           </div>

module/doc/model.php

@@ -2792,7 +2792,7 @@ EOT;
         {
             $libs                 = $this->getLibsByObject('custom', 0, '', $appendLib);
             $this->app->rawMethod = 'custom';
-            if($libID == 0) $libID = key($libs);
+            if($libID == 0 and !empty($libs)) $libID = reset($libs)->id;
             $this->lang->modulePageNav = $this->select($type, $objects, $objectID, $libs, $libID);
 
             $object     = new stdclass();
@@ -2814,7 +2814,7 @@ EOT;
             $table    = $this->config->objectTables[$type];
             $libs     = $this->getLibsByObject($type, $objectID, '', $appendLib);
 
-            if($libID == 0) $libID = reset($libs)->id;
+            if($libID == 0 and !empty($libs)) $libID = reset($libs)->id;
             $this->lang->modulePageNav = $this->select($type, $objects, $objectID, $libs, $libID);
 
             if($this->app->tab == 'doc') $this->app->rawMethod = $type;

module/install/css/step5.css

@@ -1,4 +1,4 @@
-.c-company {width: 80px !important;}
+.c-company {width: 85px !important;}
 .c-company-value {width: 300px !important;}
 
 .mw-table {max-width: 650px !important;}

module/install/view/step5.html.php

@@ -61,7 +61,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->install->password;?></th>
-            <td><?php echo html::input('password', '', "class='form-control' oninput=\"this.value = this.value.replace(/[\u4e00-\u9fa5d]/g, '');\"");?></td>
+            <td><?php echo html::input('password', '', "class='form-control' oninput=\"this.value = this.value.replace(/[\u4e00-\u9fa5]/g, '');\"");?></td>
             <td><?php echo $lang->install->placeholder->password;?></td>
           </tr>
           <tr>

module/kanban/js/view.js

@@ -1356,6 +1356,7 @@ function initKanban($kanban)
         onRenderLaneName:      renderLaneName,
         onRenderHeaderCol:     renderHeaderCol,
         onRenderCount:         renderCount,
+        showCount:             kanban.showWIP == '1' ? true : false,
         sortable:              handleSortCards,
         virtualize:            true,
         virtualRenderOptions:  {container: $(window).add($('#kanbanContainer'))},

module/kanban/lang/en.php

@@ -221,6 +221,9 @@ $lang->kanban->importObjectList['builds']     = 'Build';
 $lang->kanban->importObjectList['executions'] = 'Execution';
 $lang->kanban->importObjectList['cards']      = 'Other Kanban Cards';
 
+$lang->kanban->showWIPList[1] = 'Show';
+$lang->kanban->showWIPList[0] = 'Hide';
+
 $lang->kanban->defaultColumn = array();
 $lang->kanban->defaultColumn['wait']   = 'wait';
 $lang->kanban->defaultColumn['doing']  = 'doing';

module/kanban/lang/zh-cn.php

@@ -202,6 +202,7 @@ $lang->kanban->fullScreen         = '全屏';
 $lang->kanban->setting            = '设置';
 $lang->kanban->my                 = '我的看板';
 $lang->kanban->other              = '其他';
+$lang->kanban->showWIP            = '显示在制品限制';
 
 $lang->kanban->error = new stdclass();
 $lang->kanban->error->mustBeInt         = '在制品数量必须是正整数。';
@@ -221,6 +222,9 @@ $lang->kanban->importObjectList['builds']     = '版本';
 $lang->kanban->importObjectList['executions'] = $lang->execution->common;
 $lang->kanban->importObjectList['cards']      = '其他看板卡片';
 
+$lang->kanban->showWIPList[1] = '显示';
+$lang->kanban->showWIPList[0] = '不显示';
+
 $lang->kanban->defaultColumn = array();
 $lang->kanban->defaultColumn['wait']   = '未开始';
 $lang->kanban->defaultColumn['doing']  = '进行中';

module/kanban/view/create.html.php

@@ -26,6 +26,11 @@
         <td><?php echo html::radio('type', $typeList, $type, "onchange='changeValue({$spaceID}, this.value)'");?></td>
         <td></td>
       </tr>
+      <tr>
+        <th><?php echo $lang->kanban->WIPCount;?></th>
+        <td><?php echo html::radio('showWIP', $lang->kanban->showWIPList, 1);?></td>
+        <td></td>
+      </tr>
       <tr>
         <th><?php echo $lang->kanban->space;?></th>
         <td><?php echo html::select('space', $spacePairs, $spaceID, "onchange='changeValue(this.value)' class='form-control chosen'");?></td>

module/kanban/view/edit.html.php

@@ -24,6 +24,11 @@
         <th><?php echo $lang->kanban->space;?></th>
         <td><?php echo html::select('space', $spacePairs, $kanban->space, "class='form-control chosen'");?></td>
       </tr>
+      <tr>
+        <th><?php echo $lang->kanban->WIPCount;?></th>
+        <td><?php echo html::radio('showWIP', $lang->kanban->showWIPList, $kanban->showWIP);?></td>
+        <td></td>
+      </tr>
       <tr>
         <th><?php echo $lang->kanban->name;?></th>
         <td><?php echo html::input('name', $kanban->name, "class='form-control'");?></td>