From 4875eec38ed2e91678dbf354fb9ef3fd4c629b28 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 7 Aug 2018 17:09:11 +0800
Subject: [PATCH]  * finish task #4668.

---
 module/common/model.php  | 19 +------------------
 module/project/model.php | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index a251afb539..0afdd3ed63 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -364,7 +364,7 @@ class commonModel extends model
         foreach($items as $subMenuKey => $subMenuLink)
         {
             if(is_array($subMenuLink) and isset($subMenuLink['link'])) $subMenuLink = $subMenuLink['link'];
-            $subMenuLink = vsprintf($subMenuLink, $replace);
+            $subMenuLink = sprintf($subMenuLink, $replace);
             list($subMenuName, $subMenuModule, $subMenuMethod, $subMenuParams) = explode('|', $subMenuLink);
 
             $link = array();
@@ -544,8 +544,6 @@ class commonModel extends model
                 /* Print sub menus. */
                 if(isset($menuItem->subMenu))
                 {
-                    $firstLink  = '';
-                    $firstLabel = '';
                     foreach($menuItem->subMenu as $subMenuItem)
                     {
                         if($subMenuItem->hidden) continue;
@@ -564,21 +562,6 @@ class commonModel extends model
                         if($config->global->flow != 'onlyTest' && $currentModule == strtolower($subModule) && $currentMethod == strtolower($subMethod)) $subActive = 'active';
 
                         $subMenu .= "<li class='$subActive' data-id='$subMenuItem->name'>" . html::a($subLink, $subLabel) . '</li>';
-
-                        if(!$firstLink)  $firstLink  = $subLink;
-                        if(!$firstLabel) $firstLabel = $subLabel;
-                    }
-
-                    if(!$firstLink or !$firstLabel) continue;
-
-                    if($config->global->flow == 'onlyTest')
-                    {
-                        $link = $firstLink;
-                    }
-                    else
-                    {
-                        $link  = $firstLink;
-                        $label = $firstLabel;
                     }
 
                     if($subMenu)
diff --git a/module/project/model.php b/module/project/model.php
index 0d13ac7649..479e90bdae 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -148,7 +148,18 @@ class projectModel extends model
             {
                 $subMenu = common::createSubMenu($this->lang->project->subMenu->$key, $projectID);
 
-                if(!empty($subMenu)) $this->lang->project->menu->{$key}['subMenu'] = $subMenu;
+                if(!empty($subMenu))
+                {
+                    foreach($subMenu as $menu)
+                    {
+                        if($moduleName == strtolower($menu->link['module']) and $methodName == strtolower($menu->link['method']))
+                        {
+                            $this->lang->project->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link);
+                            break;
+                        }
+                    }
+                    $this->lang->project->menu->{$key}['subMenu'] = $subMenu;
+                }
             }
         }
     }