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

2021-12-21 09:36:54 +08:00
parent 411b060895 d8c93c3dc8
commit 6307414ef2
8 changed files with 55 additions and 39 deletions
@@ -158,17 +158,19 @@ $lang->icons['unlock']             = 'unlock-alt';
 $lang->icons['confirmStoryChange'] = 'search';
 $lang->icons['score']              = 'tint';

-$lang->createIcons['todo']      = 'todo';
-$lang->createIcons['effort']    = 'time';
-$lang->createIcons['bug']       = 'bug';
-$lang->createIcons['story']     = 'lightbulb';
-$lang->createIcons['task']      = 'check-sign';
-$lang->createIcons['testcase']  = 'sitemap';
-$lang->createIcons['doc']       = 'doc';
-$lang->createIcons['execution'] = 'run';
-$lang->createIcons['project']   = 'project';
-$lang->createIcons['product']   = 'product';
-$lang->createIcons['program']   = 'program';
+$lang->createIcons['todo']        = 'todo';
+$lang->createIcons['effort']      = 'time';
+$lang->createIcons['bug']         = 'bug';
+$lang->createIcons['story']       = 'lightbulb';
+$lang->createIcons['task']        = 'check-sign';
+$lang->createIcons['testcase']    = 'sitemap';
+$lang->createIcons['doc']         = 'doc';
+$lang->createIcons['execution']   = 'run';
+$lang->createIcons['project']     = 'project';
+$lang->createIcons['product']     = 'product';
+$lang->createIcons['program']     = 'program';
+$lang->createIcons['kanbanspace'] = 'zone';
+$lang->createIcons['kanban']      = 'kanban';


 $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'project', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage', 'entry', 'jenkins', 'gitlab');
@@ -313,17 +313,19 @@ $lang->exportFileTypeList['html'] = 'html';
 $lang->exportTypeList['all']      = 'All Data';
 $lang->exportTypeList['selected'] = 'Selected Data';

-$lang->createObjects['todo']      = 'Todo';
-$lang->createObjects['effort']    = 'Effort';
-$lang->createObjects['bug']       = 'Bug';
-$lang->createObjects['story']     = 'Story';
-$lang->createObjects['task']      = 'Task';
-$lang->createObjects['testcase']  = 'Case';
-$lang->createObjects['execution'] = $lang->execution->common;
-$lang->createObjects['project']   = 'Project';
-$lang->createObjects['product']   = 'Product';
-$lang->createObjects['program']   = 'Program';
-$lang->createObjects['doc']       = 'Doc';
+$lang->createObjects['todo']        = 'Todo';
+$lang->createObjects['effort']      = 'Effort';
+$lang->createObjects['bug']         = 'Bug';
+$lang->createObjects['story']       = 'Story';
+$lang->createObjects['task']        = 'Task';
+$lang->createObjects['testcase']    = 'Case';
+$lang->createObjects['execution']   = $lang->execution->common;
+$lang->createObjects['project']     = 'Project';
+$lang->createObjects['product']     = 'Product';
+$lang->createObjects['program']     = 'Program';
+$lang->createObjects['doc']         = 'Doc';
+$lang->createObjects['kanbanspace'] = 'Space';
+$lang->createObjects['kanban']      = 'Kanban';

 /* Language. */
 $lang->lang    = 'Language';
@@ -313,17 +313,19 @@ $lang->exportFileTypeList['html'] = 'html';
 $lang->exportTypeList['all']      = '全部记录';
 $lang->exportTypeList['selected'] = '选中记录';

-$lang->createObjects['todo']      = '待办';
-$lang->createObjects['effort']    = '日志';
-$lang->createObjects['bug']       = 'Bug';
-$lang->createObjects['story']     = '需求';
-$lang->createObjects['task']      = '任务';
-$lang->createObjects['testcase']  = '用例';
-$lang->createObjects['execution'] = $lang->execution->common;
-$lang->createObjects['project']   = '项目';
-$lang->createObjects['product']   = '产品';
-$lang->createObjects['program']   = '项目集';
-$lang->createObjects['doc']       = '文档';
+$lang->createObjects['todo']        = '待办';
+$lang->createObjects['effort']      = '日志';
+$lang->createObjects['bug']         = 'Bug';
+$lang->createObjects['story']       = '需求';
+$lang->createObjects['task']        = '任务';
+$lang->createObjects['testcase']    = '用例';
+$lang->createObjects['execution']   = $lang->execution->common;
+$lang->createObjects['project']     = '项目';
+$lang->createObjects['product']     = '产品';
+$lang->createObjects['program']     = '项目集';
+$lang->createObjects['doc']         = '文档';
+$lang->createObjects['kanbanspace'] = '空间';
+$lang->createObjects['kanban']      = '看板';

 /* 语言 */
 $lang->lang    = 'Language';
@@ -506,7 +506,7 @@ class commonModel extends model

            $createMethod = 'create';
            if($objectType == 'effort') $createMethod = 'batchCreate';
-            if(strpos('bug|execution', $objectType) !== false) $needPrintDivider = true;
+            if(strpos('|bug|execution|kanbanspace|', "|$objectType|") !== false) $needPrintDivider = true;

            if(common::hasPriv($objectType, $createMethod))
            {
@@ -566,9 +566,19 @@ class commonModel extends model
                    case 'program':
                        $params = "parentProgramID=0&extra=from=global";
                        break;
+                    case 'kanbanspace':
+                        $createMethod = 'createSpace';
+                        $isOnlyBody   = true;
+                        $attr         = "class='iframe' data-width='75%'";
+                        break;
+                    case 'kanban':
+                        $isOnlyBody = true;
+                        $attr       = "class='iframe' data-width='75%'";
+                        break;
                }

-                $html .= '<li>' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), "<i class='icon icon-$objectIcon'></i> " . $lang->createObjects[$objectType], '', $attr) . '</li>';
+                $module = $objectType == 'kanbanspace' ? 'kanban' : $objectType;
+                $html  .= '<li>' . html::a(helper::createLink($module, $createMethod, $params, '', $isOnlyBody), "<i class='icon icon-$objectIcon'></i> " . $lang->createObjects[$objectType], '', $attr) . '</li>';
            }
        }

@@ -124,7 +124,7 @@ $lang->kanban->columnColor        = 'Column Color';
 $lang->kanban->noColumnUniqueName = 'The Kanban column name already exists.';
 $lang->kanban->moveUp             = 'Swimlane Up';
 $lang->kanban->moveDown           = 'Swimlane Down';
-$lang->kanban->laneMove           = 'Swimlane Sorting';
+$lang->kanban->laneMove           = 'Swimlane Move';
 $lang->kanban->laneGroup          = 'Lane Group';
 $lang->kanban->cardsSort          = 'Cards Sortting';
 $lang->kanban->more               = 'More';
@@ -124,7 +124,7 @@ $lang->kanban->columnColor        = '看板列颜色';
 $lang->kanban->noColumnUniqueName = '看板列名称已存在';
 $lang->kanban->moveUp             = '泳道上移';
 $lang->kanban->moveDown           = '泳道下移';
-$lang->kanban->laneMove           = '泳道排序';
+$lang->kanban->laneMove           = '泳道移动';
 $lang->kanban->laneGroup          = '泳道分组';
 $lang->kanban->cardsSort          = '卡片排序';
 $lang->kanban->more               = '更多';
@@ -27,7 +27,7 @@
          </td>
        </tr>
        <tr>
-          <td colspan='4' class='text-center form-actions'>
+          <td colspan='3' class='text-center form-actions'>
            <?php echo html::submitButton();?>
            <?php echo html::commonButton($lang->cancel, "data-dismiss='modal'", 'btn btn-wide');?>
          </td>
@@ -51,7 +51,7 @@ $canCreateLane   = commonModel::hasPriv('kanban', 'createLane');
      <?php if($canEditRegion || $canCreateLane || $canDeleteRegion):?>
      <button class="btn btn-link action" type="button" data-toggle="dropdown"><i class="icon icon-ellipsis-v"></i></button>
      <ul class="dropdown-menu pull-right">
-        <?php if($canEditRegion) echo '<li>' . html::a(inlink('editRegion', "regionID={$region->id}", '', 1), '<i class="icon icon-edit"></i>' . $this->lang->kanban->editRegion, '', 'class="iframe"') . '</li>';?>
+        <?php if($canEditRegion) echo '<li>' . html::a(inlink('editRegion', "regionID={$region->id}", '', 1), '<i class="icon icon-edit"></i>' . $this->lang->kanban->editRegion, '', 'class="iframe" data-toggle="modal" data-width="600px"') . '</li>';?>
        <?php if($canCreateLane) echo '<li>' . html::a(inlink('createLane', "kanbanID={$kanban->id}&regionID={$region->id}", '', 1), '<i class="icon icon-plus"></i>' . $this->lang->kanban->createLane, '', "class='iframe'") . '</li>';?>
        <?php if($canDeleteRegion and count($regions) > 1) echo '<li>' . html::a(inlink('deleteRegion', "regionID={$region->id}"), '<i class="icon icon-trash"></i>' . $this->lang->kanban->deleteRegion, "hiddenwin") . '</li>';?>
      </ul>