- program->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
+ program->subAclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 04bf2191c7..905b5b77f1 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -173,7 +173,7 @@
project->aclList, $project->acl == 'project' ? 'private' : 'open', "onclick='setWhite(this.value);'", 'block'));?>
- project->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?>
+ program->subAclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?>
diff --git a/module/release/control.php b/module/release/control.php
index e467e81236..92c6fc264e 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -146,7 +146,8 @@ class release extends control
*/
public function view($releaseID, $type = 'story', $link = 'false', $param = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1)
{
- $release = $this->release->getByID((int)$releaseID, true);
+ $releaseID = (int)$releaseID;
+ $release = $this->release->getByID($releaseID, true);
if(!$release) die(js::error($this->lang->notFound) . js::locate('back'));
if($type == 'story') $this->session->set('storyList', $this->app->getURI(true), 'product');
diff --git a/module/repo/control.php b/module/repo/control.php
index b718fd3e7e..f5824c9f84 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -82,7 +82,6 @@ class repo extends control
$repoID = $this->repo->saveState(0, $objectID);
$this->commonAction($repoID, $objectID);
- $this->repo->setMenu($this->repos, $repoID, false);
$repoList = $this->repo->getList(0, $orderBy);
@@ -128,7 +127,6 @@ class repo extends control
$this->commonAction($repoID, $objectID);
$this->app->loadLang('action');
- $this->repo->setMenu($this->repos, $repoID, false);
$this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->create;
$this->view->position[] = $this->lang->repo->create;
@@ -332,14 +330,12 @@ class repo extends control
{
$repoID = $this->repo->saveState($repoID, $objectID);
- $this->commonAction($repoID, $objectID);
-
/* Get path and refresh. */
if($this->get->repoPath) $path = $this->get->repoPath;
if(empty($refresh) and $this->cookie->repoRefresh) $refresh = $this->cookie->repoRefresh;
/* Set menu and session. */
- $this->repo->setMenu($this->repos, $repoID);
+ $this->commonAction($repoID, $objectID);
$this->repo->setBackSession('list', $withOtherModule = true);
session_start();
@@ -830,8 +826,6 @@ class repo extends control
{
$this->commonAction($repoID, $objectID);
- $this->repo->setMenu($this->repos, $repoID);
-
if($repoID == 0) $repoID = $this->session->repoID;
if($branch) $branch = base64_decode($branch);
diff --git a/module/task/control.php b/module/task/control.php
index 00ac84bcce..beb6e3c0bf 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -646,7 +646,8 @@ class task extends control
*/
public function view($taskID)
{
- $task = $this->task->getById($taskID, true);
+ $taskID = (int)$taskID;
+ $task = $this->task->getById($taskID, true);
if(!$task) die(js::error($this->lang->notFound) . js::locate('back'));
$this->session->project = $task->project;
diff --git a/module/testcase/control.php b/module/testcase/control.php
index a5024aac36..8834b45ca8 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -588,7 +588,8 @@ class testcase extends control
*/
public function view($caseID, $version = 0, $from = 'testcase', $taskID = 0)
{
- $case = $this->testcase->getById($caseID, $version);
+ $caseID = (int)$caseID;
+ $case = $this->testcase->getById($caseID, $version);
if(!$case) die(js::error($this->lang->notFound) . js::locate('back'));
if($case->auto == 'unit')
{
@@ -814,6 +815,7 @@ class testcase extends control
$branchProduct = false;
if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($this->session->project);
+
/* The cases of a product. */
if($productID)
{
@@ -824,8 +826,6 @@ class testcase extends control
{
$libID = $productID;
$libraries = $this->loadModel('caselib')->getLibraries();
- $this->caselib->setLibMenu($libraries, $libID);
- $this->lang->testcase->menu = $this->lang->caselib->menu;
/* Set modules. */
$modules = $this->tree->getOptionMenu($libID, $viewType = 'caselib', $startModuleID = 0, $branch);
@@ -838,7 +838,7 @@ class testcase extends control
else
{
$product = $this->product->getByID($productID);
- $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch);
+ $this->testcase->setMenu($this->products, $productID, $branch);
if($product->type != 'normal') $branchProduct = true;
@@ -893,8 +893,7 @@ class testcase extends control
$showSuhosinInfo = common::judgeSuhosinSetting($countInputVars);
if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? sprintf($this->lang->suhosinInfo, $countInputVars) : sprintf($this->lang->maxVarsInfo, $countInputVars);
- $this->loadModel('story');
- $stories = $this->story->getProductStoryPairs($productID, $branch);
+ $stories = $this->loadModel('story')->getProductStoryPairs($productID, $branch);
$this->view->stories = array('' => '', 'ditto' => $this->lang->testcase->ditto) + $stories;
/* Set custom. */
diff --git a/module/testreport/control.php b/module/testreport/control.php
index cfcaf7db2f..6adc70427a 100644
--- a/module/testreport/control.php
+++ b/module/testreport/control.php
@@ -448,7 +448,8 @@ class testreport extends control
*/
public function view($reportID, $tab = 'basic', $recTotal = 0, $recPerPage = 100, $pageID = 1)
{
- $report = $this->testreport->getById($reportID);
+ $reportID = (int)$reportID;
+ $report = $this->testreport->getById($reportID);
if(!$report) die(js::error($this->lang->notFound) . js::locate('back'));
$this->session->project = $report->project;
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 6a0b7dcc67..d898d073bf 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -263,7 +263,8 @@ class testtask extends control
public function view($taskID)
{
/* Get test task, and set menu. */
- $task = $this->testtask->getById($taskID, true);
+ $taskID = (int)$taskID;
+ $task = $this->testtask->getById($taskID, true);
if(!$task) die(js::error($this->lang->notFound) . js::locate('back'));
/* When the session changes, you need to query the related products again. */
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 15db78dd87..afbac96eb6 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -4232,8 +4232,8 @@ class upgradeModel extends model
public function processMergedData($programID, $projectID, $lineID, $productIdList = array(), $sprintIdList = array())
{
/* Product linked objects. */
- $this->dao->update(TABLE_STORY)->set('project')->eq($programID)->where('product')->in($productIdList)->exec();
- $this->dao->update(TABLE_RELEASE)->set('project')->eq($programID)->where('product')->in($productIdList)->exec();
+ $this->dao->update(TABLE_STORY)->set('project')->eq($projectID)->where('product')->in($productIdList)->exec();
+ $this->dao->update(TABLE_RELEASE)->set('project')->eq($projectID)->where('product')->in($productIdList)->exec();
/* Compute product acl. */
$products = $this->dao->select('id,program,acl')->from(TABLE_PRODUCT)->where('id')->in($productIdList)->fetchAll();
diff --git a/module/upgrade/view/mergeprogram.html.php b/module/upgrade/view/mergeprogram.html.php
index 69482dfe59..dcc3c5b431 100644
--- a/module/upgrade/view/mergeprogram.html.php
+++ b/module/upgrade/view/mergeprogram.html.php
@@ -43,7 +43,7 @@
$sprint):?>
- | upgrade->project} #{$sprint->id} {$sprint->name}" . html::hidden("sprints[]", $sprint->id);?> |
+ name}" . html::hidden("sprints[]", $sprint->id);?> |
|
projects, '', "class='form-control chosen'");?> |
diff --git a/module/user/control.php b/module/user/control.php
index 6ecd7783db..9c7094011b 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -39,6 +39,7 @@ class user extends control
*/
public function view($userID)
{
+ $userID = (int)$userID;
$this->locate($this->createLink('user', 'todo', "userID=$userID&type=all"));
}
@@ -57,7 +58,8 @@ class user extends control
*/
public function todo($userID, $type = 'today', $status = 'all', $orderBy = 'date,status,begin', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
- $user = $this->user->getById($userID, 'id');
+ $userID = (int)$userID;
+ $user = $this->user->getById($userID, 'id');
if(empty($user)) die(js::error($this->lang->notFound) . js::locate('back'));
/* Set thie url to session. */
@@ -78,6 +80,7 @@ class user extends control
$todos = $this->todo->getList($type, $account, $status, 0, $pager, $sort);
$date = (int)$type == 0 ? helper::today() : $type;
$users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
+ if(!isset($users[$userID])) die(js::error($this->lang->notFound) . js::locate('back'));
/* set menus. */
$this->view->userList = $this->user->setUserList($users, $userID);
diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php
index 8a22b15661..a96838e466 100755
--- a/module/user/view/featurebar.html.php
+++ b/module/user/view/featurebar.html.php
@@ -10,7 +10,7 @@
$label = "{$lang->user->schedule}";
$active = $methodName == 'todo' ? ' btn-active-text' : '';
- common::printLink('user', 'todo', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
+ common::printLink('user', 'todo', "userID={$user->id}&type=all", $label, '', "class='btn btn-link $active'");
$label = "{$lang->user->task}";
$active = $methodName == 'task' ? ' btn-active-text' : '';