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

Merge branch 'sprint/168' into 'sprint/168_dingna_task_43401'

Browse Source 
# Conflicts:
#   module/execution/control.php
#   module/execution/view/kanban.html.php
#   module/kanban/lang/zh-cn.php
#   module/kanban/model.php
This commit is contained in:
李玉春
2021-10-29 05:50:12 +00:00
parent 6369e0f7a3 56b529d7d8
commit 8ce1a694fc
37 changed files with 870 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+4 -4
View File
@@ -1825,7 +1825,7 @@ class execution extends control
* Kanban.
*
* @param int $executionID
* @param string $type
* @param string $browseType story|bug|task|all
* @param string $orderBy
* @param string $groupBy
* @access public
@@ -1841,11 +1841,11 @@ class execution extends control
/* Compatibility IE8. */
if(strpos($this->server->http_user_agent, 'MSIE 8.0') !== false) header("X-UA-Compatible: IE=EmulateIE7");
$kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($executionID, $type, $groupBy);
$kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType);
if(empty($kanbanGroup))
{
$this->kanban->createLanes($executionID, $type, $groupBy);
$kanbanGroup = $this->kanban->getExecutionKanban($executionID);
$this->kanban->createLanes($executionID);
$kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType);
}
$this->execution->setMenu($executionID);