* Fix bug #41983.
This commit is contained in:
@@ -186,6 +186,7 @@ class design extends control
|
||||
$this->view->stories = $this->loadModel('story')->getExecutionStoryPairs($projectID);
|
||||
$this->view->productID = $productID;
|
||||
$this->view->projectID = $projectID;
|
||||
$this->view->project = $project;
|
||||
$this->view->type = $type;
|
||||
$this->view->typeList = $project->model == 'waterfall' ? $this->lang->design->typeList : $this->lang->design->plusTypeList;
|
||||
|
||||
|
||||
+7
-10
@@ -449,22 +449,19 @@ class designModel extends model
|
||||
|
||||
if($this->app->rawMethod == 'browse') $this->lang->waterfall->menu->design['subMenu']->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $this->lang->searchAB . '</a>');
|
||||
|
||||
if(empty($products) || !$productID) return '';
|
||||
if(empty($products)) return '';
|
||||
|
||||
if($productID)
|
||||
{
|
||||
$currentProduct = $this->loadModel('product')->getById($productID);
|
||||
setCookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
|
||||
}
|
||||
else
|
||||
$currentProduct = $this->loadModel('product')->getById($productID);
|
||||
setCookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
|
||||
$currentProduct = $this->loadModel('product')->getById($productID);
|
||||
if(!empty($currentProduct->shadow)) return '';
|
||||
|
||||
if(!$productID)
|
||||
{
|
||||
$currentProduct = new stdclass();
|
||||
$currentProduct->name = $this->lang->product->all;
|
||||
}
|
||||
|
||||
$currentProduct = $this->loadModel('product')->getById($productID);
|
||||
if(!empty($currentProduct->shadow)) return '';
|
||||
|
||||
$output = '';
|
||||
if(!empty($products))
|
||||
{
|
||||
|
||||
@@ -69,7 +69,7 @@ foreach($products as $product)
|
||||
<script>
|
||||
$(function()
|
||||
{
|
||||
<?php if($currentProduct->status == 'closed'):?>
|
||||
<?php if($productID && $currentProduct->status == 'closed'):?>
|
||||
$('.col-footer .toggle-right-col').click(function(){ scrollToSelected(); })
|
||||
<?php else:?>
|
||||
scrollToSelected();
|
||||
|
||||
Reference in New Issue
Block a user