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

Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
holan20180123
2021-03-19 10:49:41 +08:00
parent b5434ed770 a805f958b8
commit d492f01f0c
22 changed files with 70 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/router.class.php
+2 -2
View File
@@ -2512,8 +2512,8 @@ class super
}
elseif($this->scope == 'session')
{
$openApp = $openApp ? $openApp : $this->openApp;
$openApp ? $_SESSION["app-$openApp"][$key] = $value : $_SESSION[$key] = $value;
if($openApp) $_SESSION["app-$openApp"][$key] = $value;
$_SESSION[$key] = $value;
}
elseif($this->scope == 'env')
{
module/build/lang/de.php
+1 -1
View File
@@ -45,7 +45,7 @@ $lang->build->unlinkBug = 'Bug Verknüpgung aufheben';
$lang->build->stories = "Abgeschlossene {$lang->SRCommon}";
$lang->build->bugs = 'Gelöster Bug';
$lang->build->generatedBugs = 'Left Bug';
$lang->build->noProduct = " <span id='noProduct' style='color:red'>Dieses {$lang->executionCommon} ist nicht mit einem {$lang->productCommon} verknüpft, daher kann das Build nicht erstellt werden. Bitte erst <a href='%s' data-app='%s'> {$lang->productCommon} verknüpfen.</a></span>";
$lang->build->noProduct = " <span id='noProduct' style='color:red'>Dieses {$lang->executionCommon} ist nicht mit einem {$lang->productCommon} verknüpft, daher kann das Build nicht erstellt werden. Bitte erst <a href='%s' data-app='%s' data-toggle='modal' data-type='iframe'> {$lang->productCommon} verknüpfen.</a></span>";
$lang->build->noBuild = 'Keine Builds. ';
$lang->build->notice = new stdclass();
module/build/lang/en.php
+1 -1
View File
@@ -45,7 +45,7 @@ $lang->build->unlinkBug = 'Unlink Bug';
$lang->build->stories = "Finished {$lang->SRCommon}";
$lang->build->bugs = 'Resolved Bugs';
$lang->build->generatedBugs = 'Reported Bugs';
$lang->build->noProduct = " <span id='noProduct' style='color:red'>This {$lang->executionCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first <a href='%s' data-app='%s'> link {$lang->productCommon}</a></span>";
$lang->build->noProduct = " <span id='noProduct' style='color:red'>This {$lang->executionCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first <a href='%s' data-app='%s' data-toggle='modal' data-type='iframe'> link {$lang->productCommon}</a></span>";
$lang->build->noBuild = 'No builds yet.';
$lang->build->notice = new stdclass();
module/build/lang/fr.php
+1 -1
View File
@@ -45,7 +45,7 @@ $lang->build->unlinkBug = 'Retirer Bug';
$lang->build->stories = 'Stories terminées';
$lang->build->bugs = 'Bugs Résolus';
$lang->build->generatedBugs = 'Bugs signalés';
$lang->build->noProduct = " <span id='noProduct' style='color:red'>Ce {$lang->executionCommon} n'est pas associé à un {$lang->productCommon}, le Build ne peut pas être créé. Commencez par <a href='%s' data-app='%s'>rattacher le projet à un {$lang->productCommon}</a></span>";
$lang->build->noProduct = " <span id='noProduct' style='color:red'>Ce {$lang->executionCommon} n'est pas associé à un {$lang->productCommon}, le Build ne peut pas être créé. Commencez par <a href='%s' data-app='%s' data-toggle='modal' data-type='iframe'>rattacher le projet à un {$lang->productCommon}</a></span>";
$lang->build->noBuild = 'Aucun builds.';
$lang->build->notice = new stdclass();
module/build/lang/vi.php
+1 -1
View File
@@ -45,7 +45,7 @@ $lang->build->unlinkBug = 'Hủy liên kết Bug';
$lang->build->stories = "{$lang->SRCommon} đã kết thúc";
$lang->build->bugs = 'Bugs đã giải quyết';
$lang->build->generatedBugs = 'Bugs đã báo cáo';
$lang->build->noProduct = " <span id='noProduct' style='color:red'>{$lang->executionCommon} này chưa liên kết tới {$lang->productCommon}, bởi vậy Bản dựng này không thể tạo. Vui lòng liên kết <a href='%s' data-app='%s'> {$lang->productCommon} trước</a></span>";
$lang->build->noProduct = " <span id='noProduct' style='color:red'>{$lang->executionCommon} này chưa liên kết tới {$lang->productCommon}, bởi vậy Bản dựng này không thể tạo. Vui lòng liên kết <a href='%s' data-app='%s' data-toggle='modal' data-type='iframe'> {$lang->productCommon} trước</a></span>";
$lang->build->noBuild = 'Không có bản dựng nào';
$lang->build->notice = new stdclass();
module/build/lang/zh-cn.php
+1 -1
View File
@@ -45,7 +45,7 @@ $lang->build->unlinkBug = '移除Bug';
$lang->build->stories = "完成的{$lang->SRCommon}";
$lang->build->bugs = '解决的Bug';
$lang->build->generatedBugs = '产生的Bug';
$lang->build->noProduct = " <span id='noProduct' style='color:red'>该{$lang->executionCommon}没有关联{$lang->productCommon}，无法创建版本，请先<a href='%s' data-app='%s'>关联{$lang->productCommon}</a></span>";
$lang->build->noProduct = " <span id='noProduct' style='color:red'>该{$lang->executionCommon}没有关联{$lang->productCommon}，无法创建版本，请先<a href='%s' data-app='%s' data-toggle='modal' data-type='iframe'>关联{$lang->productCommon}</a></span>";
$lang->build->noBuild = '暂时没有版本。';
$lang->build->notice = new stdclass();
module/build/view/create.html.php
+1 -2
View File
@@ -40,11 +40,10 @@
?>
</div>
</td>
<td></td>
<?php else:?>
<td>
<div class='input-group'>
<?php printf($lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate"), $openApp);?>
<?php printf($lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate", '', 'true'), $openApp);?>
</div>
</td>
<?php endif;?>
module/common/model.php
+1 -1
View File
@@ -698,7 +698,7 @@ class commonModel extends model
if($currentModule == 'product' and $currentMethod == 'browse') $active = '';
if($currentModule == 'story') $active = '';
$misc = $openApp != $lang->navGroup->$module ? "data-app='$openApp'" : '';
$misc = isset($lang->navGroup->$module) and $openApp != $lang->navGroup->$module ? "data-app='$openApp'" : '';
$menuItemHtml = "<li class='$class $active' data-id='$menuItem->name'>" . html::a($link, $label, $target, $misc) . $subMenu . "</li>\n";
echo $menuItemHtml;
module/execution/control.php
+2
View File
@@ -1517,6 +1517,7 @@ class execution extends control
$this->view->poUsers = $poUsers;
$this->view->qdUsers = $qdUsers;
$this->view->rdUsers = $rdUsers;
$this->view->from = $this->app->openApp;
$this->display();
}
@@ -2089,6 +2090,7 @@ class execution extends control
$diffProducts = array_merge(array_diff($oldProducts, $newProducts), array_diff($newProducts, $oldProducts));
if($diffProducts) $this->loadModel('action')->create($this->objectType, $executionID, 'Managed', '', !empty($_POST['products']) ? join(',', $_POST['products']) : '');
if(isonlybody()) die(js::reload('parent'));
die(js::locate($browseExecutionLink));
}
module/execution/lang/de.php
+3 -2
View File
@@ -45,8 +45,9 @@ $lang->execution->subStatus = 'Sub Status';
$lang->execution->desc = 'Beschreibung';
$lang->execution->execDesc = 'Description';
$lang->execution->owner = 'Besitzer';
$lang->execution->PO = 'PO';
$lang->execution->PM = 'PM';
$lang->execution->PO = "{$lang->executionCommon} Owner";
$lang->execution->PM = "{$lang->executionCommon} Manager";
$lang->execution->execPM = "Execution Manager";
$lang->execution->QD = 'Test Manager';
$lang->execution->RD = 'Release Manager';
$lang->execution->release = 'Release';
module/execution/lang/en.php
+1
View File
@@ -47,6 +47,7 @@ $lang->execution->execDesc = 'Description';
$lang->execution->owner = 'Owner';
$lang->execution->PO = "{$lang->executionCommon} Owner";
$lang->execution->PM = "{$lang->executionCommon} Manager";
$lang->execution->execPM = "Execution Manager";
$lang->execution->QD = 'Test Manager';
$lang->execution->RD = 'Release Manager';
$lang->execution->release = 'Release';
module/execution/lang/fr.php
+1
View File
@@ -47,6 +47,7 @@ $lang->execution->execDesc = 'Description';
$lang->execution->owner = 'Propriétaire';
$lang->execution->PO = "Propriétaire {$lang->executionCommon}";
$lang->execution->PM = "Directeur {$lang->executionCommon}";
$lang->execution->execPM = "Directeur Execution";
$lang->execution->QD = 'Test Manager';
$lang->execution->RD = 'Release Manager';
$lang->execution->release = 'Release';
module/execution/lang/vi.php
+1
View File
@@ -47,6 +47,7 @@ $lang->execution->execDesc = 'Description';
$lang->execution->owner = 'Sở hữu';
$lang->execution->PO = "Sở hữu {$lang->executionCommon}";
$lang->execution->PM = "Quản lý {$lang->executionCommon}";
$lang->execution->execPM = "Quản lý Execution";
$lang->execution->QD = 'Quản lý QA';
$lang->execution->RD = 'Quản lý phát hành';
$lang->execution->release = 'Phát hành';
module/execution/lang/zh-cn.php
+1
View File
@@ -47,6 +47,7 @@ $lang->execution->execDesc = '执行描述';
$lang->execution->owner = '负责人';
$lang->execution->PO = $lang->productCommon . '负责人';
$lang->execution->PM = $lang->executionCommon . '负责人';
$lang->execution->execPM = '执行负责人';
$lang->execution->QD = '测试负责人';
$lang->execution->RD = '发布负责人';
$lang->execution->release = '发布';
module/execution/view/batchedit.html.php
+6 -6
View File
@@ -42,17 +42,17 @@
<thead>
<tr>
<th class='w-50px'><?php echo $lang->idAB;?></th>
<th class='required <?php echo $minWidth?>' style="width:100%"><?php echo $lang->execution->name;?></th>
<th class='w-150px required'><?php echo $lang->execution->code;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>'><?php echo $lang->execution->PM;?></th>
<th class='required <?php echo $minWidth?>' style="width:100%"><?php echo $from == 'execution' ? $lang->execution->execName : $lang->execution->name;?></th>
<th class='w-150px required'><?php echo $from == 'execution' ? $lang->execution->execCode : $lang->execution->code;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>'><?php echo $from == 'execution' ? $lang->execution->execPM : $lang->execution->PM;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'PO', ' hidden') . zget($requiredFields, 'PO', '', ' required');?>'><?php echo $lang->execution->PO;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'QD', ' hidden') . zget($requiredFields, 'QD', '', ' required');?>'><?php echo $lang->execution->QD;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'RD', ' hidden') . zget($requiredFields, 'RD', '', ' required');?>'><?php echo $lang->execution->RD;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $lang->execution->type;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->execution->status;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $from == 'execution' ? $lang->execution->execType : $lang->execution->type;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $from == 'execution' ? $lang->execution->execStatus : $lang->execution->status;?></th>
<th class='w-110px required'><?php echo $lang->execution->begin;?></th>
<th class='w-110px required'><?php echo $lang->execution->end;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', '', ' required');?>'> <?php echo $lang->execution->desc;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', '', ' required');?>'> <?php echo $from == 'execution' ? $lang->execution->execDesc : $lang->execution->desc;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'teamname', ' hidden') . zget($requiredFields, 'teamname', '', ' required');?>'><?php echo $lang->execution->teamname;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'days', ' hidden') . zget($requiredFields, 'days', '', ' required');?>'><?php echo $lang->execution->days;?></th>
</tr>
module/my/control.php
+6 -6
View File
@@ -348,7 +348,7 @@ class my extends control
public function bug($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session. load Lang. */
if($this->app->viewType != 'json') $this->session->set('bugList', $this->app->getURI(true));
if($this->app->viewType != 'json') $this->session->set('bugList', $this->app->getURI(true), 'qa');
$this->app->loadLang('bug');
/* Load pager. */
@@ -397,7 +397,7 @@ class my extends control
$pager = pager::init($recTotal, $recPerPage, $pageID);
/* Save session. */
if($this->app->viewType != 'json') $this->session->set('testtaskList', $this->app->getURI(true));
if($this->app->viewType != 'json') $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
$this->app->loadLang('testcase');
@@ -433,7 +433,7 @@ class my extends control
public function testcase($type = 'assigntome', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session, load lang. */
if($this->app->viewType != 'json') $this->session->set('caseList', $this->app->getURI(true));
if($this->app->viewType != 'json') $this->session->set('caseList', $this->app->getURI(true), 'qa');
$this->loadModel('testcase');
$this->loadModel('testtask');
@@ -478,7 +478,7 @@ class my extends control
public function doc($type = 'openedbyme', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session, load lang. */
if($this->app->viewType != 'json') $this->session->set('docList', $this->app->getURI(true));
if($this->app->viewType != 'json') $this->session->set('docList', $this->app->getURI(true), 'doc');
$this->loadModel('doc');
/* Load pager. */
@@ -521,8 +521,8 @@ class my extends control
$this->loadModel('program');
$this->app->loadLang('project');
$this->app->session->set('programList', $this->app->getURI(true));
$this->app->session->set('projectBrowse', $this->app->getURI(true));
$this->app->session->set('programList', $this->app->getURI(true), 'program');
$this->app->session->set('projectBrowse', $this->app->getURI(true), 'project');
/* Set the pager. */
$this->app->loadClass('pager', $static = true);
module/personnel/control.php
+1 -1
View File
@@ -225,7 +225,7 @@ class personnel extends control
public function setProgramMenu($programID = 0)
{
$this->loadModel('program');
$this->lang->program->switcherMenu = $this->program->getSwitcher($programID, true);
$this->lang->program->switcherMenu = $this->program->getSwitcher($programID);
commonModel::setAppObjectID('program', $programID);
}
}
module/product/control.php
+2 -2
View File
@@ -818,10 +818,10 @@ class product extends control
$products = $this->product->getProductPairsByProject($executionID);
if(empty($products))
{
die(printf($this->lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate"), 'project'));
die(printf($this->lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate", '', 'true'), 'project'));
}
die(html::select('product', $products, empty($product) ? '' : $product->id, "onchange='loadBranches(this.value);' class='form-control chosen' required"));
die(html::select('product', $products, empty($product) ? '' : $product->id, "onchange='loadBranches(this.value);' class='form-control chosen' required data-toggle='modal' data-type='iframe'"));
}
/**
module/program/model.php
-1
View File
@@ -372,7 +372,6 @@ class programModel extends model
* Get program swapper.
*
* @param int $programID
* @param bool $active
* @access private
* @return string
*/
module/story/control.php
+14 -14
View File
@@ -83,7 +83,7 @@ class story extends control
$response['message'] = $this->lang->saveSuccess;
setcookie('lastStoryModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', false, false);
$storyResult = $this->story->create($executionID, $bugID, $from = isset($fromObjectIDKey) ? $fromObjectIDKey : '');
$storyResult = $this->story->create($objectID, $bugID, $from = isset($fromObjectIDKey) ? $fromObjectIDKey : '');
if(!$storyResult or dao::isError())
{
$response['result'] = 'fail';
@@ -95,15 +95,15 @@ class story extends control
if($storyResult['status'] == 'exists')
{
$response['message'] = sprintf($this->lang->duplicate, $this->lang->story->common);
if($executionID == 0)
if($objectID == 0)
{
$response['locate'] = $this->createLink('story', 'view', "storyID={$storyID}");
}
else
{
$execution = $this->dao->findById((int)$executionID)->from(TABLE_EXECUTION)->fetch();
$execution = $this->dao->findById((int)$objectID)->from(TABLE_EXECUTION)->fetch();
$moduleName = $execution->type == 'project' ? 'projectstory' : 'execution';
$param = $execution->type == 'project' ? "project=$executionID" : "executionID=$executionID";
$param = $execution->type == 'project' ? "project=$objectID" : "executionID=$objectID";
$response['locate'] = $this->createLink($moduleName, 'story', $param);
}
$this->send($response);
@@ -119,9 +119,9 @@ class story extends control
}
$actionID = $this->action->create('story', $storyID, $action, '', $extra);
if($executionID != 0)
if($objectID != 0)
{
if($executionID != $this->session->PRJ) $this->loadModel('action')->create('story', $storyID, 'linked2project', '', $executionID);
if($objectID != $this->session->PRJ) $this->loadModel('action')->create('story', $storyID, 'linked2project', '', $objectID);
$this->loadModel('action')->create('story', $storyID, 'linked2project', '', $this->session->PRJ);
}
@@ -139,12 +139,12 @@ class story extends control
if($this->post->newStory)
{
$response['message'] = $this->lang->story->successSaved . $this->lang->story->newStory;
$response['locate'] = $this->createLink('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID&story=0&executionID=$executionID&bugID=$bugID");
$response['locate'] = $this->createLink('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID&story=0&objectID=$objectID&bugID=$bugID");
$this->send($response);
}
$moduleID = $this->post->module ? $this->post->module : 0;
if($executionID == 0)
if($objectID == 0)
{
setcookie('storyModule', 0, 0, $this->config->webRoot, '', false, false);
$productID = $this->post->product ? $this->post->product : $productID;
@@ -155,9 +155,9 @@ class story extends control
else
{
setcookie('storyModuleParam', 0, 0, $this->config->webRoot, '', false, true);
$execution = $this->dao->findById((int)$executionID)->from(TABLE_EXECUTION)->fetch();
$execution = $this->dao->findById((int)$objectID)->from(TABLE_EXECUTION)->fetch();
$moduleName = $execution->type == 'project' ? 'projectstory' : 'execution';
$param = $execution->type == 'project' ? "productID=$productID" : "executionID=$executionID&orderBy=id_desc&browseType=unclosed";
$param = $execution->type == 'project' ? "productID=$productID" : "executionID=$objectID&orderBy=id_desc&browseType=unclosed";
$response['locate'] = $this->createLink($moduleName, 'story', $param);
}
if($this->app->getViewType() == 'xhtml') $response['locate'] = $this->createLink('story', 'view', "storyID=$storyID");
@@ -165,9 +165,9 @@ class story extends control
}
/* Set products, users and module. */
if($executionID != 0)
if($objectID != 0)
{
$products = $this->product->getProductPairsByProject($executionID);
$products = $this->product->getProductPairsByProject($objectID);
$productID = empty($productID) ? key($products) : $productID;
$product = $this->product->getById(($productID and array_key_exists($productID, $products)) ? $productID : key($products));
}
@@ -302,7 +302,7 @@ class story extends control
$this->view->branches = $product->type != 'normal' ? $this->loadModel('branch')->getPairs($productID) : array();
$this->view->productID = $productID;
$this->view->product = $product;
$this->view->executionID = $executionID;
$this->view->objectID = $objectID;
$this->view->estimate = $estimate;
$this->view->storyTitle = $title;
$this->view->spec = $spec;
@@ -311,7 +311,7 @@ class story extends control
$this->view->mailto = $mailto;
$this->view->blockID = $blockID;
$this->view->URS = $type == 'story' ? $this->story->getRequierements($productID) : '';
$this->view->needReview = ($this->app->user->account == $product->PO || $executionID > 0 || $this->config->story->needReview == 0) ? "checked='checked'" : "";
$this->view->needReview = ($this->app->user->account == $product->PO || $objectID > 0 || $this->config->story->needReview == 0) ? "checked='checked'" : "";
$this->view->type = $type;
$this->display();
module/story/view/create.html.php
+1 -1
View File
@@ -258,7 +258,7 @@
</div>
</div>
<?php if(isset($execution)) js::set('execution', $execution);?>
<?php js::set('executionID', $executionID);?>
<?php js::set('executionID', $objectID);?>
<?php js::set('storyModule', $lang->story->module);?>
<?php js::set('storyType', $type);?>
<script>
module/user/control.php
+22 -21
View File
@@ -63,8 +63,8 @@ class user extends control
/* Set thie url to session. */
$uri = $this->app->getURI(true);
$this->session->set('todoList', $uri);
$this->session->set('bugList', $uri);
$this->session->set('taskList', $uri);
$this->session->set('bugList', $uri, 'qa');
$this->session->set('taskList', $uri, 'execution');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -114,7 +114,7 @@ class user extends control
public function story($userID, $storyType = 'story', $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session. */
$this->session->set('storyList', $this->app->getURI(true));
$this->session->set('storyList', $this->app->getURI(true), 'product');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -162,7 +162,7 @@ class user extends control
public function task($userID, $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save the session. */
$this->session->set('taskList', $this->app->getURI(true));
$this->session->set('taskList', $this->app->getURI(true), 'execution');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -206,7 +206,7 @@ class user extends control
public function bug($userID, $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save the session. */
$this->session->set('bugList', $this->app->getURI(true));
$this->session->set('bugList', $this->app->getURI(true), 'qa');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -263,7 +263,7 @@ class user extends control
$this->view->userList = $this->user->setUserList($users, $userID);
/* Save session. */
$this->session->set('testtaskList', $this->app->getURI(true));
$this->session->set('testtaskList', $this->app->getURI(true), 'qa');
$this->app->loadLang('testcase');
@@ -301,7 +301,7 @@ class user extends control
public function testcase($userID, $type = 'case2Him', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session, load lang. */
$this->session->set('caseList', $this->app->getURI(true));
$this->session->set('caseList', $this->app->getURI(true), 'qa');
$this->app->loadLang('testcase');
/* Load pager. */
@@ -362,7 +362,7 @@ class user extends control
public function execution($userID, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$uri = $this->app->getURI(true);
$this->session->set('projectList', $uri);
$this->session->set('executionList', $uri, 'execution');
$user = $this->user->getById($userID, 'id');
$account = $user->account;
@@ -405,7 +405,7 @@ class user extends control
public function issue($userID, $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$uri = $this->app->getURI(true);
$this->session->set('issueList', $uri);
$this->session->set('issueList', $uri, 'project');
$user = $this->user->getById($userID, 'id');
$account = $user->account;
@@ -448,7 +448,7 @@ class user extends control
public function risk($userID, $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$uri = $this->app->getURI(true);
$this->session->set('riskList', $uri);
$this->session->set('riskList', $uri, 'project');
$user = $this->user->getById($userID, 'id');
$account = $user->account;
@@ -1094,17 +1094,18 @@ class user extends control
$this->view->userList = $this->user->setUserList($users, $userID);
/* Save session. */
$uri = $this->app->getURI(true);
$this->session->set('productList', $uri);
$this->session->set('productPlanList', $uri);
$this->session->set('releaseList', $uri);
$this->session->set('storyList', $uri);
$this->session->set('projectList', $uri);
$this->session->set('taskList', $uri);
$this->session->set('buildList', $uri);
$this->session->set('bugList', $uri);
$this->session->set('caseList', $uri);
$this->session->set('testtaskList', $uri);
$uri = $this->app->getURI(true);
$this->session->set('productList', $uri, 'product');
$this->session->set('productPlanList', $uri, 'product');
$this->session->set('releaseList', $uri, 'product');
$this->session->set('storyList', $uri, 'product');
$this->session->set('projectList', $uri, 'project');
$this->session->set('executionList', $uri, 'execution');
$this->session->set('taskList', $uri, 'execution');
$this->session->set('buildList', $uri, 'execution');
$this->session->set('bugList', $uri, 'qa');
$this->session->set('caseList', $uri, 'qa');
$this->session->set('testtaskList', $uri, 'qa');
/* Set the pager. */
$this->app->loadClass('pager', $static = true);