diff --git a/module/execution/control.php b/module/execution/control.php
index d43091bab6..7c1cd7ab8e 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2551,7 +2551,7 @@ class execution extends control
* @access public
* @return void
*/
- public function ajaxGetDropMenu($module, $method, $extra)
+ public function ajaxGetDropMenu($executionID, $module, $method, $extra)
{
$projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->in($this->app->user->view->projects)->andWhere('deleted')->eq(0)->orderBy('order_desc')->fetchAll('id');
@@ -2579,6 +2579,7 @@ class execution extends control
$this->view->link = $this->execution->getLink($module, $method, $extra);
$this->view->module = $module;
$this->view->method = $method;
+ $this->view->executionID = $executionID;
$this->view->extra = $extra;
$this->view->projects = $this->project->getPairsByModel();
$this->view->executions = $orderedExecutions;
diff --git a/module/execution/model.php b/module/execution/model.php
index 7ce583bb40..65a9080a8f 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -139,7 +139,7 @@ class executionModel extends model
}
}
- $dropMenuLink = helper::createLink('execution', 'ajaxGetDropMenu', "module=$currentModule&method=$currentMethod&extra=$extra");
+ $dropMenuLink = helper::createLink('execution', 'ajaxGetDropMenu', "executionID=$executionID&module=$currentModule&method=$currentMethod&extra=$extra");
$currentExecutionName = '';
if(isset($currentExecution->name)) $currentExecutionName = $currentExecution->name;
@@ -850,7 +850,7 @@ class executionModel extends model
$currentExecutionName = $currentExecution->name;
}
- $dropMenuLink = helper::createLink('execution', 'ajaxGetDropMenu', "module=$currentModule&method=$currentMethod&extra=");
+ $dropMenuLink = helper::createLink('execution', 'ajaxGetDropMenu', "executionID=$executionID&module=$currentModule&method=$currentMethod&extra=");
$output = "
';
$output .= "
+
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 45311efea1..6009847aba 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -22,43 +22,44 @@ $closedProductsHtml = '';
foreach($products as $product)
{
+ $selected = $product->id == $productID ? 'selected' : '';
$productName = $product->program ? zget($programs, $product->program, '') . '/' : '';
$productName .= $product->line ? zget($lines, $product->line, '') . '/' . $product->name : $product->name;
if($product->status == 'normal' and $product->PO == $this->app->user->account)
{
$objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
$linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
- $myProductsHtml .= html::a($linkHtml, $productName, '', "class='text-important' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
+ $myProductsHtml .= html::a($linkHtml, $productName, '', "class='text-important $selected' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
}
else if($product->status == 'normal' and !($product->PO == $this->app->user->account))
{
$objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
$linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
- $normalProductsHtml .= html::a($linkHtml, $productName, '', "title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
+ $normalProductsHtml .= html::a($linkHtml, $productName, '', "class='$selected' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
}
else if($product->status == 'closed')
{
$objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
$linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $objectID);
- $closedProductsHtml .= html::a($linkHtml, $productName, '', "title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
+ $closedProductsHtml .= html::a($linkHtml, $productName, '', "class='$selected' title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
}
}
?>
- {$lang->product->mine}
";
- echo $myProductsHtml;
- if(!empty($myProductsHtml))
- {
- echo "
{$lang->product->other}
";
- }
- }
- echo $normalProductsHtml;
- ?>
+ {$lang->product->mine}
";
+ echo $myProductsHtml;
+ if(!empty($myProductsHtml))
+ {
+ echo "
{$lang->product->other}
";
+ }
+ }
+ echo $normalProductsHtml;
+ ?>
+
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index ec39df6304..299cdd5410 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -20,34 +20,35 @@ $projectsPinYin = common::convert2Pinyin($projectNames);
foreach($projects as $project)
{
- $link = helper::createLink('project', 'index', "projectID=%s", '', '', $project->id);
+ $selected = $project->id == $projectID ? 'selected' : '';
+ $link = helper::createLink('project', 'index', "projectID=%s", '', '', $project->id);
$projectName = zget($programs, $project->parent, '') ? zget($programs, $project->parent) . '/' . $project->name : $project->name;
if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account)
{
- $myProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "class='text-important' title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'");
+ $myProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "class='text-important $selected' title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'");
}
else if($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account))
{
- $normalProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'");
+ $normalProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "class='selected' title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'");
}
- else if($project->status == 'done' or $project->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'");
+ else if($project->status == 'done' or $project->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "class='$selected' title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'");
}
?>
- {$lang->project->myProject}
";
- echo $myProjectsHtml;
- if(!empty($myProjectsHtml))
- {
- echo "
{$lang->project->other}
";
- }
- }
- echo $normalProjectsHtml;
- ?>
+ {$lang->project->myProject}
";
+ echo $myProjectsHtml;
+ if(!empty($myProjectsHtml))
+ {
+ echo "
{$lang->project->other}
";
+ }
+ }
+ echo $normalProjectsHtml;
+ ?>
+