Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/206_liumengyi_58288' of https://gitlab.zcorp.cc/easycorp/zentaopms into liu

Browse Source
This commit is contained in:
tianshujie
2022-06-23 09:42:58 +08:00
parent 31f920d59f c26c9dc110
commit 413248e27d
7 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -1
View File
@@ -1747,7 +1747,7 @@ class execution extends control
$this->view->teamMembers = $this->execution->getTeamMembers($executionID);
if($this->config->systemMode == 'new') $this->view->allProjects = $this->project->getPairsByModel($project->model, 0, 'noclosed', $project->id);
$this->view->laneCount = $this->kanban->getLaneCount($executionID, $execution->model);
$this->view->laneCount = $this->kanban->getLaneCount($executionID, $execution->type);
$this->view->heightType = $execution->displayCards > 2 ? 'custom' : 'auto';
$this->view->displayCards = $execution->displayCards ? $execution->displayCards : '';
module/execution/model.php
-2
View File
@@ -333,7 +333,6 @@ class executionModel extends model
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', helper::now())
->setDefault('team', substr($this->post->name, 0, 30))
->setDefault('displayCards', 0)
->setIF($this->post->heightType == 'auto', 'displayCards', 0)
->setIF(!isset($_POST['whitelist']), 'whitelist', '')
->setIF($this->config->systemMode == 'new', 'parent', $this->post->project)
@@ -487,7 +486,6 @@ class executionModel extends model
->add('id', $executionID)
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', helper::now())
->setDefault('displayCards', 0)
->setIF($this->post->heightType == 'auto', 'displayCards', 0)
->setIF(helper::isZeroDate($this->post->begin), 'begin', '')
->setIF(helper::isZeroDate($this->post->end), 'end', '')
module/kanban/control.php
-1
View File
@@ -274,7 +274,6 @@ class kanban extends control
$this->view->displayCards = $kanban->displayCards ? $kanban->displayCards : '';
$this->view->enableImport = empty($kanban->object) ? 'off' : 'on';
$this->view->importObjects = empty($kanban->object) ? array() : explode(',', $kanban->object);
a($this->view->laneCount);
$this->display();
}
module/kanban/css/create.css
+2
View File
@@ -7,3 +7,5 @@
#mainContent .objectBox .checkbox-primary>label:not(:first-child) {padding-left: 20px;}
#mainContent .objectBox .checkbox-primary>label:before {top: 1px; left: -2px;}
#mainContent .objectBox .checkbox-primary>label:after {width: 14px; height: 14px;}
[lang^='en'] .columnWidth {width: 120px;}
[lang^='zh-cn'] .columnWidth {width: 80px;}
module/kanban/css/edit.css
+2
View File
@@ -8,3 +8,5 @@
#mainContent .laneHeightBox .tip {color: #999;}
#mainContent .objectBox .checkbox-primary>label:before {top: 1px; left: -2px;}
#mainContent .objectBox .checkbox-primary>label:after {width: 14px; height: 14px;}
[lang^='en'] .columnWidth {width: 120px;}
[lang^='zh-cn'] .columnWidth {width: 80px;}
module/kanban/view/create.html.php
+1 -2
View File
@@ -15,7 +15,6 @@
<?php js::set('spaceType', $type);?>
<?php js::set('enableImport', 'off');?>
<?php js::set('vision', $this->config->vision);?>
<?php $width = $this->app->getClientLang() == 'en' ? 'w-120px' : 'w-80px';?>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2><?php echo $lang->kanban->create;?></h2>
@@ -51,7 +50,7 @@
</tr>
<?php endif;?>
<tr>
<th class='<?php echo $width;?>'><?php echo $lang->kanban->columnWidth;?></th>
<th class='columnWidth'><?php echo $lang->kanban->columnWidth;?></th>
<td><?php echo nl2br(html::radio('fluidBoard', $lang->kanbancolumn->fluidBoardList, 0));?></td>
</tr>
<tr class="hidden" id='cardBox'>
module/kanban/view/edit.html.php
+1 -2
View File
@@ -14,7 +14,6 @@
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::set('enableImport', $enableImport);?>
<?php js::set('vision', $this->config->vision);?>
<?php $width = $this->app->getClientLang() == 'en' ? 'w-120px' : 'w-80px';?>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2><?php echo $lang->kanban->edit;?></h2>
@@ -44,7 +43,7 @@
</tr>
<?php endif;?>
<tr>
<th class='<?php echo $width;?>'><?php echo $lang->kanban->columnWidth;?></th>
<th class='columnWidth'><?php echo $lang->kanban->columnWidth;?></th>
<td><?php echo nl2br(html::radio('fluidBoard', $lang->kanbancolumn->fluidBoardList, $kanban->fluidBoard));?></td>
</tr>
<?php if($laneCount > 1):?>