diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php index 7ae7f3bf3a..e5ac0900c0 100644 --- a/module/execution/view/ajaxgetdropmenu.html.php +++ b/module/execution/view/ajaxgetdropmenu.html.php @@ -91,7 +91,7 @@ foreach($executions as $projectID => $projectExecutions) } else if($execution->status == 'done' or $execution->status == 'closed') { - $closedExecutionsHtml .= '
  • ' . html::a(sprintf($link, $execution->id), $execution->name, '', "class='$selected' title='$execution->name' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . '
  • '; + $closedExecutionsHtml .= '
  • ' . html::a(sprintf($link, $execution->id), $execution->name, '', "class='$selected executionName' title='$execution->name' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . '
  • '; if($selected == 'selected') $tabActive = 'closed'; } diff --git a/module/product/model.php b/module/product/model.php index 54d363dcd5..2ba76b1433 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1555,7 +1555,7 @@ class productModel extends model ->fetchGroup('product', 'id'); $executionListKey = $this->config->systemMode == 'new' ? 'project' : 'productID'; - $executionList = $this->dao->select('t1.product as productID,t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1') + $executionList = $this->dao->select('t1.product as productID,t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1') ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id') ->where('type')->in('stage,sprint') ->beginIF($this->config->systemMode == 'new')->andWhere('t2.project')->in(array_keys($projectList))->fi() diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php index 8d1560446a..67954d3a17 100644 --- a/module/product/view/ajaxgetdropmenu.html.php +++ b/module/product/view/ajaxgetdropmenu.html.php @@ -95,7 +95,7 @@ foreach($products as $programID => $programProducts) } else if($product->status == 'closed') { - $closedProductsHtml .= '
  • ' . html::a($linkHtml, $productName, '', "class='$selected' title='$productName' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$app->tab'") . '
  • '; + $closedProductsHtml .= '
  • ' . html::a($linkHtml, $productName, '', "class='$selected productName' title='$productName' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$app->tab'") . '
  • '; if($selected == 'selected') $tabActive = 'closed'; } diff --git a/module/program/model.php b/module/program/model.php index 8c4b96809b..ac484166a2 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -819,7 +819,7 @@ class programModel extends model while($program = $stmt->fetch()) { $link = $this->getLink($moduleName, $methodName, $program->id, $vars, $from); - $linkHtml = html::a($link, $program->name, '', "id='program$program->id' class='text-ellipsis' title=$program->name"); + $linkHtml = html::a($link, $program->name, '', "id='program$program->id' class='text-ellipsis programName' title=$program->name"); if(isset($programMenu[$program->id]) and !empty($programMenu[$program->id])) { diff --git a/module/program/view/ajaxgetdropmenu.html.php b/module/program/view/ajaxgetdropmenu.html.php index 38da2a55c0..47a7cf7534 100644 --- a/module/program/view/ajaxgetdropmenu.html.php +++ b/module/program/view/ajaxgetdropmenu.html.php @@ -54,6 +54,8 @@ $programsPinYin = common::convert2Pinyin($programNames); #programTree ul > li.has-list:after {width: 14px;} #programTree ul > li.item-meas a.selected{color: #0c64eb;} #showClosed1 + label{color: #3c4353} + +a.programName:focus, a.programName:hover {background: #0c64eb; color: #fff !important;}