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

Merge branch 'sprint/168_dingna_merge' into 'sprint/168'

Browse Source 
* Conflict resolution.

See merge request easycorp/zentaopms!235
This commit is contained in:
李玉春
2021-10-29 06:16:03 +00:00
parent 188d3fa8d9 d5914e8ffc
commit 2e8baf8959
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+3 -4
View File
@@ -1831,7 +1831,7 @@ class execution extends control
* @access public
* @return void
*/
public function kanban($executionID, $type = 'all', $orderBy = 'order_asc', $groupBy = 'default')
public function kanban($executionID, $browseType = 'all', $orderBy = 'order_asc', $groupBy = 'default')
{
/* Save to session. */
$uri = $this->app->getURI(true);
@@ -1844,7 +1844,7 @@ class execution extends control
$kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType);
if(empty($kanbanGroup))
{
$this->kanban->createLanes($executionID);
$this->kanban->createLanes($executionID, $browseType, $groupBy);
$kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType);
}
@@ -1875,10 +1875,9 @@ class execution extends control
$this->view->executionID = $executionID;
$this->view->productID = $productID;
$this->view->allPlans = $allPlans;
$this->view->browseType = '';
$this->view->browseType = $browseType;
$this->view->kanbanGroup = $kanbanGroup;
$this->view->execution = $execution;
$this->view->type = $type;
$this->view->groupBy = $groupBy;
$this->view->canBeChanged = $canBeChanged;
module/execution/view/kanban.html.php
+2 -2
View File
@@ -14,10 +14,10 @@
<div class='btn-toolbar pull-left'>
<div class="input-control space c-type">
<i class="icon icon-list-all"></i>
<?php echo html::select('type', $lang->kanban->type, $type, 'class="form-control chosen" data-max_drop_width="215"');?>
<?php echo html::select('type', $lang->kanban->type, $browseType, 'class="form-control chosen" data-max_drop_width="215"');?>
</div>
<div class="input-control space c-group">
<?php echo html::select('group', $lang->kanban->group->$type, $groupBy, 'class="form-control chosen" data-max_drop_width="215"');?>
<?php echo html::select('group', $lang->kanban->group->$browseType, $groupBy, 'class="form-control chosen" data-max_drop_width="215"');?>
</div>
</div>
<div class='btn-toolbar pull-right'>