- | id"), sprintf('%03d', $build->id));?> |
+ id"), sprintf('%03d', $build->id), '', "data-app='project'");?> |
productName;?> |
branchName) echo "{$build->branchName}"?>
- createLink('build', 'view', "build=$build->id"), $build->name);?>
+ createLink('build', 'view', "build=$build->id"), $build->name, '', "data-app='project'");?>
|
executionName;?> |
scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath;?> |
diff --git a/module/repo/control.php b/module/repo/control.php
index f84763a89a..6c53faba2d 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -35,25 +35,31 @@ class repo extends control
* Common actions.
*
* @param int $objectID projectID|executionID
+ * @param int $repoID
* @access public
* @return void
*/
- public function commonAction($objectID)
+ public function commonAction($objectID, $repoID = 0)
{
- if($this->app->openApp == 'project')
- {
- /* Set repo menu group. */
- $this->scm = $this->app->loadClass('scm');
- $this->repos = $this->repo->getRepoPairs($objectID);
- if(empty($this->repos) and $this->methodName != 'create') die(js::locate($this->repo->createLink('create', "objectID=$objectID")));
+ $openApp = $this->app->openApp;
+ $this->repos = $this->repo->getRepoPairs($openApp, $objectID);
+ $this->scm = $this->app->loadClass('scm');
+ if($openApp == 'project')
+ {
$this->loadModel('project')->setMenu($objectID);
}
- else if($this->app->openApp == 'execution')
+ else if($openApp == 'execution')
{
$executions = $this->loadModel('execution')->getPairs(0, 'all', 'nocode');
$this->execution->setMenu($executions, $objectID);
}
+ else
+ {
+ $this->repo->setMenu($this->repos, $repoID);
+ }
+
+ if(empty($this->repos) and $this->methodName != 'create') die(js::locate($this->repo->createLink('create', "objectID=$objectID")));
}
/**
@@ -118,7 +124,7 @@ class repo extends control
$this->view->position[] = $this->lang->repo->create;
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->users = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted');
- $this->view->products = $this->loadModel('product')->getProductPairsByProject($this->projectID);
+ $this->view->products = $this->loadModel('product')->getProductPairsByProject($objectID);
$this->display();
}
diff --git a/module/repo/model.php b/module/repo/model.php
index 88894e106c..7c436029a7 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -285,18 +285,19 @@ class repoModel extends model
/**
* Get repo pairs.
*
+ * @param string $type project|execution|repo
* @param int $projectID
* @access public
* @return array
*/
- public function getRepoPairs($projectID = 0)
+ public function getRepoPairs($type, $projectID = 0)
{
$repos = $this->dao->select('*')->from(TABLE_REPO)
->where('deleted')->eq(0)
->fetchAll();
/* Get products. */
- $productIdList = $this->loadModel('product')->getProductIDByProject($projectID, false);
+ $productIdList = ($type == 'project' or $type == 'execution') ? $this->loadModel('product')->getProductIDByProject($projectID, false) : array();
$repoPairs = array();
foreach($repos as $repo)
@@ -305,7 +306,7 @@ class repoModel extends model
$scm = $repo->SCM == 'Subversion' ? 'svn' : 'git';
if($this->checkPriv($repo))
{
- if($projectID)
+ if($type == 'project' or $type == 'execution')
{
foreach($productIdList as $productID)
{
diff --git a/module/task/control.php b/module/task/control.php
index 6f3b5fd129..f87ede1663 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -478,8 +478,8 @@ class task extends control
$this->loadModel('my')->setMenu();
$moduleIndex = array_search('task', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
- $this->lang->task->menu = $this->lang->my->workMenu;
- $this->lang->my->menu->myWork['subModule'] = 'task';
+ $this->lang->task->menu = $this->lang->my->menu->work;
+ $this->lang->my->menu->work['subModule'] = 'task';
$this->view->position[] = html::a($this->createLink('my', 'task'), $this->lang->my->task);
$this->view->title = $this->lang->task->batchEdit;
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 10b2747ed2..ea5d8b20c8 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -810,8 +810,8 @@ class testcase extends control
/* The cases of my. */
$this->loadModel('my')->setMenu();
- $this->lang->testcase->menu = $this->lang->my->workMenu;
- $this->lang->my->menu->myWork['subModule'] = 'testcase';
+ $this->lang->testcase->menu = $this->lang->my->menu->work;
+ $this->lang->my->menu->work['subModule'] = 'testcase';
$this->view->position[] = html::a($this->server->http_referer, $this->lang->my->testCase);
$this->view->title = $this->lang->testcase->batchEdit;
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 398b3fceec..cc80de34a7 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -1094,8 +1094,8 @@ class testtask extends control
/* The case of my. */
else
{
- $this->lang->testtask->menu = $this->lang->my->workMenu;
- $this->lang->my->menu->myWork['subModule'] = 'testtask';
+ $this->lang->testtask->menu = $this->lang->my->menu->work;
+ $this->lang->my->menu->work['subModule'] = 'testtask';
$this->view->title = $this->lang->testtask->batchRun;