diff --git a/module/datatable/control.php b/module/datatable/control.php
index 7f3d7b1291..5ff84da3f2 100644
--- a/module/datatable/control.php
+++ b/module/datatable/control.php
@@ -106,6 +106,7 @@ class datatable extends control
if(!$project->multiple) unset($cols['execution']);
if(!$project->hasProduct and $project->model != 'scrum') unset($cols['plan']);
+ if(!$project->hasProduct) unset($cols['branch']);
}
if($moduleName == 'execution' and $method == 'bug')
@@ -113,12 +114,14 @@ class datatable extends control
$execution = $this->loadModel('execution')->getByID($this->session->execution);
$project = $this->loadModel('project')->getByID($execution->project);
if(!$project->hasProduct and $project->model != 'scrum') unset($cols['plan']);
+ if(!$project->hasProduct) unset($cols['branch']);
}
if($moduleName == 'execution' and $method == 'story')
{
$execution = $this->loadModel('execution')->getByID($this->session->execution);
if(!$execution->hasProduct and !$execution->multiple) unset($cols['plan']);
+ if(!$execution->hasProduct) unset($cols['branch']);
}
$this->view->cols = $cols;
diff --git a/module/design/control.php b/module/design/control.php
old mode 100644
new mode 100755
index 79981d19a8..56b6f0cd86
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -39,8 +39,12 @@ class design extends control
*/
public function commonAction($projectID = 0, $productID = 0, $designID = 0)
{
- $products = $this->product->getProductPairsByProject($projectID);
- $productID = $this->product->saveState($productID, $products);
+ $products = $this->product->getProductPairsByProject($projectID);
+ $products[0] = $this->lang->product->all;
+
+ ksort($products);
+
+ $productID = $this->product->saveState($productID, $products);
$this->lang->modulePageNav = $this->design->setMenu($projectID, $products, $productID);
$this->project->setMenu($projectID);
@@ -72,6 +76,11 @@ class design extends control
$this->session->set('reviewList', $this->app->getURI(true), 'project');
/* Build the search form. */
+ $products = $this->product->getProductPairsByProject($projectID);
+ $productIdList = $productID ? $productID : array_keys($products);
+ $stories = $this->loadModel('story')->getProductStoryPairs($productIdList, 'all', 0, 'active', 'id_desc', 0, 'full', 'story', false);
+ $this->config->design->search['params']['story']['values'] = $stories;
+
$queryID = ($type == 'bySearch') ? (int)$param : 0;
$actionURL = $this->createLink('design', 'browse', "projectID=$projectID&productID=$productID&type=bySearch&queryID=myQueryID");
$this->design->buildSearchForm($queryID, $actionURL);
@@ -111,6 +120,9 @@ class design extends control
$pager = pager::init(0, $recPerPage, $pageID);
$designs = $this->design->getList($projectID, $productID, $type, $queryID, $orderBy, $pager);
+ $project = $this->loadModel('project')->getByID($projectID);
+ $this->view->hiddenProduct = $project->hasProduct ? false : true;
+
$this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->browse;
$this->view->position[] = $this->lang->design->browse;
@@ -158,12 +170,16 @@ class design extends control
return $this->send($response);
}
+ $products = $this->product->getProductPairsByProject($projectID);
+ $productIdList = $productID ? $productID : array_keys($products);
+
$this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->create;
$this->view->position[] = $this->lang->design->create;
$this->view->users = $this->loadModel('user')->getPairs('noclosed');
- $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productID, 'all', 0, 'active');
+ $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productIdList, 'all', 0, 'active', 'id_desc', 0, 'full', 'story', false);
$this->view->productID = $productID;
+ $this->view->projectID = $projectID;
$this->view->type = $type;
$this->view->project = $this->loadModel('project')->getByID($projectID);
@@ -201,10 +217,13 @@ class design extends control
return $this->send($response);
}
+ $products = $this->product->getProductPairsByProject($projectID);
+ $productIdList = $productID ? $productID : array_keys($products);
+
$this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->batchCreate;
$this->view->position[] = $this->lang->design->batchCreate;
- $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productID);
+ $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productIdList);
$this->view->users = $this->loadModel('user')->getPairs('noclosed');
$this->view->type = $type;
@@ -226,11 +245,14 @@ class design extends control
$this->session->set('revisionList', $this->app->getURI(true));
$this->session->set('storyList', $this->app->getURI(true), 'product');
+ $products = $this->product->getProductPairsByProject($design->project);
+ $productIdList = $design->product ? $design->product : array_keys($products);
+
$this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->view;
$this->view->position[] = $this->lang->design->view;
$this->view->design = $design;
- $this->view->stories = $this->loadModel('story')->getProductStoryPairs($design->product);
+ $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productIdList);
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->actions = $this->loadModel('action')->getList('design', $design->id);
$this->view->repos = $this->loadModel('repo')->getRepoPairs('project', $design->project);
@@ -275,12 +297,15 @@ class design extends control
return $this->send($response);
}
+ $products = $this->product->getProductPairsByProject($design->project);
+ $productIdList = $design->product ? $design->product : array_keys($products);
+
$this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->edit;
$this->view->position[] = $this->lang->design->edit;
$this->view->design = $design;
$this->view->project = $this->loadModel('project')->getByID($design->project);
- $this->view->stories = $this->loadModel('story')->getProductStoryPairs($design->product);
+ $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productIdList);
$this->view->users = $this->loadModel('user')->getPairs('noclosed');
$this->display();
@@ -450,6 +475,26 @@ class design extends control
$this->display();
}
+ /**
+ * Ajax get stories by productID and projectID.
+ *
+ * @param int $productID
+ * @param int $projectID
+ * @param string $status
+ * @param string $hasParent
+ * @access public
+ * @return void
+ */
+ public function ajaxGetProductStories($productID, $projectID, $status = 'all', $hasParent = 'true')
+ {
+ $products = $this->product->getProductPairsByProject($projectID);
+ $productIdList = $productID ? $productID : array_keys($products);
+
+ $stories = $this->loadModel('story')->getProductStoryPairs($productIdList, 'all', 0, $status, 'id_desc', 0, 'full', 'story', $hasParent);
+
+ return print(html::select('story', $stories, '', "class='form-control'"));
+ }
+
/**
* Delete a design.
*
diff --git a/module/design/js/common.js b/module/design/js/common.js
old mode 100644
new mode 100755
index 7fbbb1f978..b49bdce6cc
--- a/module/design/js/common.js
+++ b/module/design/js/common.js
@@ -1,12 +1,12 @@
$(document).on('click', '.ajaxPager', function()
-{
+{
$('#logBox').load($(this).attr('href'));
return false;
})
$('#product').change(function()
{
productID = $(this).val();
- var link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=all&moduleID=0&storyID=0&onlyOption=false&status=active');
+ var link = createLink('design', 'ajaxGetProductStories', 'productID=' + productID + '&projectID=' + projectID + '&status=active&hasParent=false');
$.post(link, function(data)
{
$('#story').replaceWith(data);
diff --git a/module/design/model.php b/module/design/model.php
old mode 100644
new mode 100755
index 811cc87f4d..5d12207bf8
--- a/module/design/model.php
+++ b/module/design/model.php
@@ -240,11 +240,12 @@ class designModel extends model
*/
public function getByID($designID = 0)
{
+ $this->app->loadLang('product');
$design = $this->dao->select('*')->from(TABLE_DESIGN)->where('id')->eq($designID)->fetch();
if(!$design) return false;
$design->files = $this->loadModel('file')->getByObject('design', $designID);
- $design->productName = $this->dao->findByID($design->product)->from(TABLE_PRODUCT)->fetch('name');
+ $design->productName = $design->product ? $this->dao->findByID($design->product)->from(TABLE_PRODUCT)->fetch('name') : $this->lang->product->all;
$design->commit = '';
@@ -317,7 +318,7 @@ class designModel extends model
->where('deleted')->eq(0)
->beginIF($projectID)->andWhere('project')->eq($projectID)->fi()
->beginIF($type != 'all')->andWhere('type')->in($type)->fi()
- ->andWhere('product')->eq($productID)
+ ->beginIF($productID)->andWhere('product')->eq($productID)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
@@ -376,11 +377,11 @@ class designModel extends model
$designQuery = $this->session->designQuery;
- $designs = $this->dao->select('*')->from(TABLE_DESIGN)
+ $designs = $this->dao->select('*')->from(TABLE_DESIGN)
->where($designQuery)
->andWhere('deleted')->eq('0')
->andWhere('project')->eq($projectID)
- ->andWhere('product')->eq($productID)
+ ->beginIF($productID)->andWhere('product')->eq($productID)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
@@ -426,7 +427,16 @@ class designModel extends model
if(empty($products) || !$productID) return '';
- setCookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+ if($productID)
+ {
+ $currentProduct = $this->loadModel('product')->getById($productID);
+ setCookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+ }
+ else
+ {
+ $currentProduct = new stdclass();
+ $currentProduct->name = $this->lang->product->all;
+ }
$currentProduct = $this->loadModel('product')->getById($productID);
if(!empty($currentProduct->shadow)) return '';
diff --git a/module/design/view/ajaxgetdropmenu.html.php b/module/design/view/ajaxgetdropmenu.html.php
old mode 100644
new mode 100755
index 19ebf15310..3b91968cba
--- a/module/design/view/ajaxgetdropmenu.html.php
+++ b/module/design/view/ajaxgetdropmenu.html.php
@@ -43,6 +43,9 @@ foreach($products as $product)
createLink('design', 'browse', "projectID=$projectID"), $lang->product->all, '', "class=$selected data-app='$tab'");
+
if(!empty($myProductsHtml))
{
echo "
{$lang->product->mine}
";
diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php
index 6405b28ba9..b8f98304b1 100644
--- a/module/design/view/browse.html.php
+++ b/module/design/view/browse.html.php
@@ -32,8 +32,9 @@
recTotal}&recPerPage={$pager->recPerPage}";?>
- | idAB);?> |
- design->name);?> |
+ idAB);?> |
+ design->name);?> |
+ design->product);?> |
design->type);?> |
design->assignedTo);?> |
design->createdByAB);?> |
@@ -46,6 +47,7 @@
| id);?> |
createLink('design', 'view', "id={$design->id}"), $design->name) : $design->name;?> |
+ product);?> |
design->typeList, $design->type);?> |
design->printAssignedHtml($design, $users);?> |
createdBy);?> |
@@ -53,9 +55,9 @@
id}";
- common::printIcon('design', 'edit', $vars, $design, 'list', 'alter');
- common::printIcon('design', 'viewCommit', $vars, $design, 'list', 'list-alt', '', 'iframe showinonlybody', true);
- common::printIcon('design', 'delete', $vars, $design, 'list', 'trash', 'hiddenwin');
+ common::printIcon('design', 'edit', $vars, $design, 'list', 'alter');
+ if(helper::hasFeature('devops')) common::printIcon('design', 'viewCommit', $vars, $design, 'list', 'list-alt', '', 'iframe showinonlybody', true);
+ common::printIcon('design', 'delete', $vars, $design, 'list', 'trash', 'hiddenwin');
?>
|
diff --git a/module/design/view/create.html.php b/module/design/view/create.html.php
old mode 100644
new mode 100755
index 5658c47786..f79116a6b9
--- a/module/design/view/create.html.php
+++ b/module/design/view/create.html.php
@@ -13,6 +13,7 @@
+
diff --git a/module/design/view/edit.html.php b/module/design/view/edit.html.php
old mode 100644
new mode 100755
index bf0385d656..6748509152
--- a/module/design/view/edit.html.php
+++ b/module/design/view/edit.html.php
@@ -13,6 +13,7 @@
type);?>
+project);?>
diff --git a/module/design/view/linkcommit.html.php b/module/design/view/linkcommit.html.php
index d6b5517f4a..ad182f5974 100644
--- a/module/design/view/linkcommit.html.php
+++ b/module/design/view/linkcommit.html.php
@@ -74,7 +74,9 @@