From 1b2228a367f348bf00237ee9fe2d74b8aafae3cc Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Sat, 29 Aug 2020 13:21:46 +0800
Subject: [PATCH] * Adjust common/weekly code detail.

---
 module/common/model.php            | 30 ++++--------------------------
 module/common/view/header.html.php | 19 ++++++++++---------
 module/group/lang/resource.php     |  2 +-
 module/weekly/model.php            |  4 ++--
 4 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 0058e3786b..08aa139576 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -436,7 +436,7 @@ class commonModel extends model
             if(isset($lang->cmmi->subMenu->$key))
             {    
                 $programSubMenu = $lang->cmmi->subMenu->$key;
-                $subMenu        = common::createSubMenu($lang->cmmi->subMenu->$key, $app->session->program);
+                $subMenu        = common::createSubMenu($programSubMenu, $app->session->program);
 
                 if(!empty($subMenu))
                 {    
@@ -446,6 +446,7 @@ class commonModel extends model
                         $isActive['method']    = ($moduleName == strtolower($menu->link['module']) and $methodName == strtolower($menu->link['method']));
                         $isActive['alias']     = ($moduleName == strtolower($menu->link['module']) and (is_array($itemMenu) and isset($itemMenu['alias']) and strpos($itemMenu['alias'], $methodName) !== false));
                         $isActive['subModule'] = (is_array($itemMenu) and isset($itemMenu['subModule']) and strpos($itemMenu['subModule'], $moduleName) !== false);
+
                         if($isActive['method'] or $isActive['alias'] or $isActive['subModule'])
                         {    
                             $lang->menu->cmmi->{$key}['link'] = $menu->text . "|" . join('|', $menu->link);
@@ -2122,31 +2123,8 @@ EOD;
         }
         if($group == 'system')    
         {
-            foreach($lang->system->menu as $key => $menu)
-            {   
-                self::setMenuVars($lang->system->menu, $key, $menu);
-
-                if(isset($lang->system->subMenu->{$key}))
-                {   
-                    $subMenu = self::createSubMenu($lang->system->subMenu->{$key}, $menu);
-
-                    if(!empty($subMenu))
-                    {   
-                        foreach($subMenu as $menu)
-                        {   
-                            if(($moduleName == strtolower($menu->link['module']) and $methodName == strtolower($menu->link['method'])))
-                            {   
-                                $lang->system->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link);
-                                break;
-                            }   
-                        }   
-                        $lang->system->menu->{$key}['subMenu'] = $subMenu;
-                    }   
-                }   
-            }
-
-            $lang->menu      = $lang->system->menu;
-            $lang->menuOrder = $lang->system->menuOrder;
+            $lang->menu         = $lang->system->menu;
+            $lang->menuOrder    = $lang->system->menuOrder;
             $lang->report->menu = $lang->measurement->menu;
         }
         if($group == 'doclib') return;
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 056c95a2f4..94f4e55e95 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -54,15 +54,16 @@ include 'chosen.html.php';
 <?php endif;?>
 
 <?php if(isset($this->config->qcVersion)):?>
-    <script>
-    $("#userMenu").append('<button class="btn btn-mini" type="button" id="showSearchGo" style="padding: 2px 3px;"><i class="icon icon-sm icon-search"></i></button>');
-    $("#searchbox").hide();
-    $("#showSearchGo").on("click", function(){$("#searchbox").show(); $("#showSearchGo").hide();});
-    $("#searchInput").mouseout(function(){
-        var searchValue = $("#searchInput").val();
-        if(searchValue == ''){$("#searchbox").hide(); $("#showSearchGo").show()};
-    });
-    </script>
+<script>
+$("#userMenu").append('<button class="btn btn-mini" type="button" id="showSearchGo" style="padding: 2px 3px;"><i class="icon icon-sm icon-search"></i></button>');
+$("#searchbox").hide();
+$("#showSearchGo").on("click", function(){$("#searchbox").show(); $("#showSearchGo").hide();});
+$("#searchInput").mouseout(function()
+{
+    var searchValue = $("#searchInput").val();
+    if(searchValue == ''){$("#searchbox").hide(); $("#showSearchGo").show()};
+});
+</script>
 <?php endif;?>
 <main id='main' <?php if(!empty($config->sso->redirect)) echo "class='ranzhiFixedTfootAction'";?> >
   <div class='container'>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index a2105dfa32..66b62eb3c3 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -508,7 +508,7 @@ $lang->resource->design->browse      = 'browse';
 $lang->resource->design->create      = 'create';
 $lang->resource->design->batchCreate = 'batchCreate';
 $lang->resource->design->edit        = 'edit';
-$lang->resource->design->commit      = 'commit';
+$lang->resource->design->linkCommit  = 'linkCommit';
 $lang->resource->design->revision    = 'revision';
 $lang->resource->design->delete      = 'delete';
 $lang->resource->design->view        = 'view';
diff --git a/module/weekly/model.php b/module/weekly/model.php
index c7b0758908..1276719d86 100644
--- a/module/weekly/model.php
+++ b/module/weekly/model.php
@@ -120,9 +120,9 @@ class weeklyModel extends model
     }
 
     /**
-     * GetThisMonday
+     * Get monday for a date.
      *
-     * @param  int    $date
+     * @param  int $date
      * @access public
      * @return date
      */