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

* merge from 15.0.beta3.

Browse Source
This commit is contained in:
wangyidong
2021-06-05 13:01:53 +08:00
parent 7ff5ccae12
commit 769e6b433b
220 changed files with 2661 additions and 1370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+15 -4
View File
@@ -966,6 +966,7 @@ class execution extends control
*/
public function testreport($executionID = 0, $objectType = 'execution', $extra = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($this->session->project);
echo $this->fetch('testreport', 'browse', "objectID=$executionID&objectType=$objectType&extra=$extra&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
}
@@ -1287,6 +1288,8 @@ class execution extends control
$this->executeHooks($executionID);
if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $executionID));
if($this->app->openApp == 'doc')
{
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('doc', 'objectLibs', "type=execution")));
@@ -1901,14 +1904,14 @@ class execution extends control
if($_POST)
{
$stories = $this->loadModel('story')->getStories($executionID, 0, 0, $orderBy);
$stories = $this->loadModel('story')->getExecutionStories($executionID, 0, 0, $orderBy);
$storySpecs = $this->story->getStorySpecs(array_keys($stories));
$order = 1;
foreach($stories as $story) $story->order = $order++;
$kanbanTasks = $this->execution->getKanbanTasks($executionID, "id");
$kanbanBugs = $this->loadModel('bug')->getBugs($executionID);
$kanbanBugs = $this->loadModel('bug')->getExecutionBugs($executionID);
$users = array();
$taskAndBugs = array();
@@ -1978,7 +1981,7 @@ class execution extends control
$this->view->hasBurn = $hasBurn;
$this->view->datas = $datas;
$this->view->chartData = $chartData;
$this->view->chartData = isset($chartData) ? $chartData : array();
$this->view->storySpecs = $storySpecs;
$this->view->realnames = $this->loadModel('user')->getRealNameAndEmails($users);
$this->view->executionID = $executionID;
@@ -2186,6 +2189,7 @@ class execution extends control
if(!empty($_POST))
{
$this->execution->manageMembers($executionID);
$this->loadModel('action')->create('team', $executionID, 'managedTeam');
die(js::locate($this->createLink('execution', 'team', "executionID=$executionID"), 'parent'));
}
@@ -2252,6 +2256,7 @@ class execution extends control
$account = $user->account;
$this->execution->unlinkMember($executionID, $account);
if(!dao::isError()) $this->loadModel('action')->create('team', $executionID, 'managedTeam');
/* if ajax request, send result. */
if($this->server->ajax)
@@ -2375,7 +2380,7 @@ class execution extends control
$this->view->object = $object;
$this->view->products = $products;
$this->view->allStories = empty($allStories) ? $allStories : $allStories[$pageID - 1];;
$this->view->allStories = empty($allStories) ? $allStories : $allStories[$pageID - 1];
$this->view->pager = $pager;
$this->view->browseType = $browseType;
$this->view->productType = $productType;
@@ -2713,6 +2718,12 @@ class execution extends control
$this->project->setMenu($projectID);
}
if($this->app->viewType == 'mhtml')
{
$executionID = $this->execution->saveState(0, $this->executions);
$this->execution->setMenu($executionID);
}
/* Load pager and get tasks. */
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);