From 79e1029298c5ac2e09972d228d372add5a3516d5 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Fri, 26 Feb 2021 17:33:50 +0800
Subject: [PATCH] * Fix code review error.

---
 config/filter.php                             |  1 -
 module/block/view/riskblock.html.php          |  9 ++-----
 module/block/view/waterfallriskblock.html.php |  7 +----
 module/bug/control.php                        |  1 +
 module/bug/css/browse.css                     |  2 +-
 module/bug/css/create.css                     | 10 +++----
 module/bug/css/edit.css                       |  4 +--
 module/common/lang/de.php                     | 17 ------------
 module/common/lang/en.php                     | 17 ------------
 module/common/lang/fr.php                     | 17 ------------
 module/common/lang/menuOrder.php              |  3 ---
 module/common/lang/vi.php                     | 17 ------------
 module/common/lang/zh-cn.php                  | 27 ++++---------------
 module/common/model.php                       |  2 +-
 module/common/view/kindeditor.html.php        | 10 +++----
 module/design/css/browse.css                  |  6 ++---
 module/group/lang/resource.php                |  6 -----
 module/group/model.php                        | 23 +++++++++++-----
 18 files changed, 42 insertions(+), 137 deletions(-)

diff --git a/config/filter.php b/config/filter.php
index 62947feb97..6c402d5c5f 100644
--- a/config/filter.php
+++ b/config/filter.php
@@ -78,7 +78,6 @@ $filter->product->index              = new stdclass();
 $filter->product->export             = new stdclass();
 $filter->product->project            = new stdclass();
 $filter->program->default            = new stdclass();
-$filter->program->prjbrowse          = new stdclass();
 $filter->program->pgmproject         = new stdclass();
 $filter->program->prjbrowse          = new stdclass();
 $filter->program->pgmbrowse          = new stdclass();
diff --git a/module/block/view/riskblock.html.php b/module/block/view/riskblock.html.php
index fbe40fac72..3f0cbcc58a 100644
--- a/module/block/view/riskblock.html.php
+++ b/module/block/view/riskblock.html.php
@@ -29,18 +29,13 @@
     <tbody>
       <?php foreach($risks as $risk):?>
       <?php
-      $appid    = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
+      $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
       ?>
       <tr>
         <td class='c-id-xs'><?php echo sprintf('%03d', $risk->id);?></td>
         <td class='c-name' title='<?php echo $risk->name?>'><?php echo html::a($this->createLink('risk', 'view', "riskID=$risk->id", '', '', $risk->PRJ), $risk->name)?></td>
         <?php if($longBlock):?>
-        <?php
-        $priColor = 'pri-low';
-        if($risk->pri == 'middle') $priColor = 'pri-middle';
-        if($risk->pri == 'high')   $priColor = 'pri-high';
-        ?>
-        <td class='c-pri'><?php echo "<span class='$priColor'>" . zget($lang->risk->priList, $risk->pri) . "</span>";?></td>
+        <td class='c-pri'><?php echo "<span class='pri-{$risk->pri}'>" . zget($lang->risk->priList, $risk->pri) . "</span>";?></td>
         <td class='c-category'><?php echo zget($lang->risk->categoryList, $risk->category)?></td>
         <td class='c-identifiedDate'><?php echo $risk->identifiedDate == '0000-00-00' ? '' : $risk->identifiedDate;?></td>
         <?php endif;?>
diff --git a/module/block/view/waterfallriskblock.html.php b/module/block/view/waterfallriskblock.html.php
index c124aa59bb..a10fc30cab 100644
--- a/module/block/view/waterfallriskblock.html.php
+++ b/module/block/view/waterfallriskblock.html.php
@@ -42,12 +42,7 @@
         </td>
         <?php if($longBlock):?>
         <td class='c-rate'><?php echo $risk->rate?></td>
-        <?php
-        $priColor = 'pri-low';
-        if($risk->pri == 'middle') $priColor = 'pri-middle';
-        if($risk->pri == 'high')   $priColor = 'pri-high';
-        ?>
-        <td><?php echo "<span class='$priColor'>" . zget($lang->risk->priList, $risk->pri) . "</span>";?></td>
+        <td><?php echo "<span class='pri-{$risk->pri}'>" . zget($lang->risk->priList, $risk->pri) . "</span>";?></td>
         <td><?php echo zget($users, $risk->assignedTo, $risk->assignedTo)?></td>
         <td class='c-category'><?php echo zget($lang->risk->categoryList, $risk->category, $risk->category)?></td>
         <?php endif;?>
diff --git a/module/bug/control.php b/module/bug/control.php
index 883858866f..61642bfc65 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -12,6 +12,7 @@
 class bug extends control
 {
     public $products  = array();
+
     public $projectID = 0;
 
     /**
diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css
index a086652442..ce02e2513b 100644
--- a/module/bug/css/browse.css
+++ b/module/bug/css/browse.css
@@ -20,7 +20,7 @@ td.delayed{color:#fff; background: #e84e0f!important;}
 .dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
 
 th.c-confirmed {text-align: center;}
-.c-severity{overflow: hidden; white-space: nowrap;}
+.c-severity {overflow: hidden; white-space: nowrap;}
 .c-id {text-overflow:ellipsis; white-space:nowrap;}
 
 .body-modal #mainMenu>.btn-toolbar {width: auto;}
diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index a3f2692fe7..7919d7ff7e 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -26,10 +26,10 @@ html[lang='en'] #deadlineTd .input-group-addon{padding: 5px 18px}
 
 .colorpicker.input-group-btn > .btn {border-right: none}
 
-.input-group-addon.w-90px{min-width:90px;}
-.input-group .input-group-btn .btn{padding: 6px 12px;}
-.input-group .chosen-container{min-width: 80px;}
-#all{border-left:none}
+.input-group-addon.w-90px {min-width:90px;}
+.input-group .input-group-btn .btn {padding: 6px 12px;}
+.input-group .chosen-container {min-width: 80px;}
+#all {border-left:none}
 
 .pri-selector > .btn {padding: 5px 8px!important; width: 100%;}
 .pri-selector > .dropdown-menu {padding: 10px;}
@@ -39,7 +39,7 @@ html[lang='en'] #deadlineTd .input-group-addon{padding: 5px 18px}
 .title-group .chosen-container {width: 1%!important; min-width: 70px;}
 .title-group #severity + .chosen-container > .chosen-single {border-radius: 0!important;}
 .title-group #pri + .chosen-container > .chosen-single {border-top-left-radius: 0!important; border-bottom-left-radius: 0!important;}
-#mainContent .center-block{padding-bottom:40px;}
+#mainContent .center-block {padding-bottom:40px;}
 
 #typeBox {width:180px;}
 #typeBox .required:after {right: 1px;}
diff --git a/module/bug/css/edit.css b/module/bug/css/edit.css
index fe1b116189..b35d2836cb 100644
--- a/module/bug/css/edit.css
+++ b/module/bug/css/edit.css
@@ -2,6 +2,6 @@
 .col-side .chosen-container {width: 218px!important}
 .col-side .chosen-container[id^="openedBuild"] {width: 172px!important}
 .col-side .chosen-container[id^="resolvedBuild"] {width: 172px!important}
-.chosen-choices li.search-choice{word-break: break-all;}
+.chosen-choices li.search-choice {word-break: break-all;}
 #linkBugBox > li {margin-left:-56px}
-#branch{width: 95px;}
+#branch {width: 95px;}
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index cb08de0850..360fa4cc7f 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -328,23 +328,6 @@ $lang->my->dividerMenu = ',myProject,team,';
 $lang->todo = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
-/* Product menu settings. */
-$lang->scrumproduct = new stdclass();
-$lang->scrumproduct->menu = new stdclass();
-
-$lang->scrumproduct->menu->story    = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->scrumproduct->menu->plan     = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan');
-$lang->scrumproduct->menu->release  = array('link' => 'Release|release|browse|productID=%s',     'subModule' => 'release');
-$lang->scrumproduct->menu->roadmap  = 'Roadmap|product|roadmap|productID=%s';
-$lang->scrumproduct->menu->project  = "{$lang->executionCommon}|product|project|status=all&productID=%s";
-$lang->scrumproduct->menu->dynamic  = 'Verlauf|product|dynamic|productID=%s';
-$lang->scrumproduct->menu->doc      = array('link' => 'Dok|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->scrumproduct->menu->branch   = '@branch@|branch|manage|productID=%s';
-$lang->scrumproduct->menu->module   = 'Modul|tree|browse|productID=%s&view=story';
-$lang->scrumproduct->menu->view     = array('link' => 'Übersicht|product|view|productID=%s', 'alias' => 'edit');
-$lang->scrumproduct->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->scrumproduct->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
-
 $lang->product->dividerMenu = ',plan,project,dashboard,';
 
 $lang->story = new stdclass();
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index f4473d972c..0fa00044b6 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -328,23 +328,6 @@ $lang->my->dividerMenu = ',myProject,team,';
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
-/* Product menu settings. */
-$lang->scrumproduct = new stdclass();
-$lang->scrumproduct->menu = new stdclass();
-
-$lang->scrumproduct->menu->story    = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->scrumproduct->menu->plan     = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan');
-$lang->scrumproduct->menu->release  = array('link' => 'Release|release|browse|productID=%s',     'subModule' => 'release');
-$lang->scrumproduct->menu->roadmap  = 'Roadmap|product|roadmap|productID=%s';
-$lang->scrumproduct->menu->project  = "{$lang->executionCommon}|product|project|status=all&productID=%s";
-$lang->scrumproduct->menu->dynamic  = 'Dynamics|product|dynamic|productID=%s';
-$lang->scrumproduct->menu->doc      = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->scrumproduct->menu->branch   = '@branch@|branch|manage|productID=%s';
-$lang->scrumproduct->menu->module   = 'Module|tree|browse|productID=%s&view=story';
-$lang->scrumproduct->menu->view     = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit');
-$lang->scrumproduct->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->scrumproduct->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
-
 $lang->product->dividerMenu = ',plan,project,dashboard,';
 
 $lang->story = new stdclass();
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 33d6b575ed..9e125c202f 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -328,23 +328,6 @@ $lang->my->dividerMenu = ',myProject,team,';
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
-/* Product menu settings. */
-$lang->scrumproduct = new stdclass();
-$lang->scrumproduct->menu = new stdclass();
-
-$lang->scrumproduct->menu->story    = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->scrumproduct->menu->plan     = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan');
-$lang->scrumproduct->menu->release  = array('link' => 'Release|release|browse|productID=%s',     'subModule' => 'release');
-$lang->scrumproduct->menu->roadmap  = 'Roadmap|product|roadmap|productID=%s';
-$lang->scrumproduct->menu->project  = "{$lang->executionCommon}|product|project|status=all&productID=%s";
-$lang->scrumproduct->menu->dynamic  = 'Dynamics|product|dynamic|productID=%s';
-$lang->scrumproduct->menu->doc      = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->scrumproduct->menu->branch   = '@branch@|branch|manage|productID=%s';
-$lang->scrumproduct->menu->module   = 'Module|tree|browse|productID=%s&view=story';
-$lang->scrumproduct->menu->view     = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit');
-$lang->scrumproduct->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->scrumproduct->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
-
 $lang->product->dividerMenu = ',plan,project,dashboard,';
 
 $lang->story = new stdclass();
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index d5a9bbc83b..34a78fc754 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -134,9 +134,6 @@ $lang->system->menuOrder[5]  = 'company';
 $lang->system->menuOrder[10] = 'scrum';
 $lang->system->menuOrder[15] = 'waterfall';
 
-/* system menu order. */
-$lang->subject->menuOrder[15] = 'concept';
-
 /* admin menu order. */
 $lang->admin->menuOrder[5]  = 'index';
 $lang->admin->menuOrder[9]  = 'company';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 135ec74307..94461b5d60 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -328,23 +328,6 @@ $lang->my->dividerMenu = ',myProject,team,';
 $lang->todo    = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
-/* Product menu settings. */
-$lang->scrumproduct = new stdclass();
-$lang->scrumproduct->menu = new stdclass();
-
-$lang->scrumproduct->menu->story    = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->scrumproduct->menu->plan     = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan');
-$lang->scrumproduct->menu->release  = array('link' => 'Release|release|browse|productID=%s',     'subModule' => 'release');
-$lang->scrumproduct->menu->roadmap  = 'Roadmap|product|roadmap|productID=%s';
-$lang->scrumproduct->menu->project  = "{$lang->executionCommon}|product|project|status=all&productID=%s";
-$lang->scrumproduct->menu->dynamic  = 'Dynamics|product|dynamic|productID=%s';
-$lang->scrumproduct->menu->doc      = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->scrumproduct->menu->branch   = '@branch@|branch|manage|productID=%s';
-$lang->scrumproduct->menu->module   = 'Module|tree|browse|productID=%s&view=story';
-$lang->scrumproduct->menu->view     = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit');
-$lang->scrumproduct->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->scrumproduct->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
-
 $lang->product->dividerMenu = ',plan,project,dashboard,';
 
 $lang->story = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 83714199f6..77ce890a28 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -327,23 +327,6 @@ $lang->my->dividerMenu = ',myProject,team,';
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
-/* 产品视图设置。*/
-$lang->scrumproduct = new stdclass();
-$lang->scrumproduct->menu = new stdclass();
-
-$lang->scrumproduct->menu->story   = array('link' => "{$lang->SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->scrumproduct->menu->plan    = array('link' => "计划|productplan|browse|productID=%s", 'subModule' => 'productplan');
-//$lang->scrumproduct->menu->release = array('link' => '发布|release|browse|productID=%s',     'subModule' => 'release');
-$lang->scrumproduct->menu->roadmap = '路线图|product|roadmap|productID=%s';
-$lang->scrumproduct->menu->project = "{$lang->executionCommon}|product|project|status=all&productID=%s";
-$lang->scrumproduct->menu->dynamic = '动态|product|dynamic|productID=%s';
-$lang->scrumproduct->menu->doc     = array('link' => '文档|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->scrumproduct->menu->branch  = '@branch@|branch|manage|productID=%s';
-$lang->scrumproduct->menu->module  = '模块|tree|browse|productID=%s&view=story';
-$lang->scrumproduct->menu->view    = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit');
-$lang->scrumproduct->menu->requirement = array('link' => "{$lang->URCommon}|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->scrumproduct->menu->story       = array('link' => "{$lang->SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
-
 $lang->product->dividerMenu = ',plan,project,dashboard,';
 
 $lang->story = new stdclass();
@@ -922,11 +905,11 @@ $lang->scrum->subMenu->other = new stdclass();
 $lang->scrum->subMenu->other->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder');
 
 $lang->scrum->setMenu = new stdclass();
-$lang->scrum->setMenu->view           = array('link' => '概况|program|prjview|project={PROJECT}', 'alias' => 'prjedit');
-$lang->scrum->setMenu->products       = array('link' => '产品|program|PRJManageProducts|project={PROJECT}', 'alias' => 'prjmanageproducts');
-$lang->scrum->setMenu->group          = array('link' => '权限|program|PRJGroup|project={PROJECT}', 'alias' => 'prjgroup,prjmanageview,prjmanagepriv');
-$lang->scrum->setMenu->members        = array('link' => '团队|program|PRJManageMembers|project={PROJECT}', 'alias' => 'prjmanagemembers');
-$lang->scrum->setMenu->whitelist      = array('link' => '白名单|program|PRJWhitelist|project={PROJECT}', 'subModule' => 'personnel');
+$lang->scrum->setMenu->view      = array('link' => '概况|program|prjview|project={PROJECT}', 'alias' => 'prjedit');
+$lang->scrum->setMenu->products  = array('link' => '产品|program|PRJManageProducts|project={PROJECT}', 'alias' => 'prjmanageproducts');
+$lang->scrum->setMenu->group     = array('link' => '权限|program|PRJGroup|project={PROJECT}', 'alias' => 'prjgroup,prjmanageview,prjmanagepriv');
+$lang->scrum->setMenu->members   = array('link' => '团队|program|PRJManageMembers|project={PROJECT}', 'alias' => 'prjmanagemembers');
+$lang->scrum->setMenu->whitelist = array('link' => '白名单|program|PRJWhitelist|project={PROJECT}', 'subModule' => 'personnel');
 
 /* Waterfall menu. */
 $lang->menu->waterfall = new stdclass();
diff --git a/module/common/model.php b/module/common/model.php
index be0833efd2..575885da83 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -716,7 +716,7 @@ class commonModel extends model
                 /* Avoid highlighting the same navigation method at the same time. */
                 if($currentModule == 'feedback' and $currentMethod == 'admin') $active = '';
                 if($currentModule == 'product' and $currentMethod == 'browse') $active = '';
-                if($currentModule == 'story' and $currentMethod == 'track')    $active = '';
+                if($currentModule == 'story') $active = '';
 
                 $menuItemHtml = "<li class='$class $active' data-id='$menuItem->name'>" . html::a($link, $label, $target) . $subMenu . "</li>\n";
 
diff --git a/module/common/view/kindeditor.html.php b/module/common/view/kindeditor.html.php
index 3f5b033f75..d558a5b4e2 100755
--- a/module/common/view/kindeditor.html.php
+++ b/module/common/view/kindeditor.html.php
@@ -38,7 +38,7 @@ $uid = uniqid('');
     'fullscreen', 'source', 'preview', 'about'];
     var editorToolsMap = {fullTools: fullTools, simpleTools: simpleTools, bugTools: bugTools};
 
-    /* Kindeditor default options */
+    /* Kindeditor default options. */
     var editorDefaults =
     {
         cssPath: [config.themeRoot + 'zui/css/min.css'],
@@ -59,7 +59,7 @@ $uid = uniqid('');
 
     window.editor = {};
 
-    /* Init kindeditor */
+    /* Init kindeditor. */
     var setKindeditor = function(element, options)
     {
         var $editor  = $(element);
@@ -102,7 +102,7 @@ $uid = uniqid('');
         catch(e){return false;}
     };
 
-    /* Init kindeditor with jquery way */
+    /* Init kindeditor with jquery way. */
     $.fn.kindeditor = function(options)
     {
         return this.each(function()
@@ -111,7 +111,7 @@ $uid = uniqid('');
         });
     };
 
-    /* Init all kindeditor */
+    /* Init all kindeditor. */
     var initKindeditor = function(afterInit)
     {
         var $submitBtn = $('form :input[type=submit]');
@@ -127,7 +127,7 @@ $uid = uniqid('');
         });
     };
 
-    /* Init all kindeditors when document is ready */
+    /* Init all kindeditors when document is ready. */
     $(initKindeditor);
 }(jQuery));
 </script>
diff --git a/module/design/css/browse.css b/module/design/css/browse.css
index 39ae64f44b..b3ee542a8e 100644
--- a/module/design/css/browse.css
+++ b/module/design/css/browse.css
@@ -1,3 +1,3 @@
-#featurebar{display:inline-block;}
-#querybox #searchform{border-bottom: 1px solid #ddd; margin-bottom: 20px;}
-#designTable td{white-space:nowrap; text-overflow:ellipsis; overflow: hidden}
+#featurebar {display:inline-block;}
+#querybox #searchform {border-bottom: 1px solid #ddd; margin-bottom: 20px;}
+#designTable td {white-space:nowrap; text-overflow:ellipsis; overflow: hidden}
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 3776ecaff4..58b3c97e16 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1078,12 +1078,6 @@ $lang->mail->methodOrder[55] = 'sendCloud';
 $lang->mail->methodOrder[60] = 'sendcloudUser';
 $lang->mail->methodOrder[65] = 'ztCloud';
 
-/* Subject. */
-$lang->resource->subject = new stdclass();
-$lang->resource->subject->browse = 'browse';
-
-$lang->subject->methodOrder[5]  = 'browse';
-
 /* Custom. */
 $lang->resource->custom = new stdclass();
 $lang->resource->custom->index              = 'index';
diff --git a/module/group/model.php b/module/group/model.php
index 6a460aa763..2c2f8a130b 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -332,15 +332,24 @@ class groupModel extends model
             }
         }
 
-        if($this->config->systemMode)
+        if($this->config->systemMode == 'old')
         {
-            $this->dao->replace(TABLE_GROUPPRIV)
-                ->set('module')->eq('program')
-                ->set('method')->eq('prjbrowse')
-                ->where('module')->eq('project')
-                ->andWhere('method')->eq('list')
+            $prjBrowse = $this->dao->select('module')->from(TABLE_GROUPPRIV)
+                ->where('module')->eq('program')
+                ->andWhere('method')->eq('prjbrowse')
                 ->andWhere('`group`')->eq($groupID)
-                ->exec();
+                ->fetch('module');
+
+            if(!$prjBrowse)
+            {
+                $this->dao->update(TABLE_GROUPPRIV)
+                    ->set('module')->eq('program')
+                    ->set('method')->eq('prjbrowse')
+                    ->where('module')->eq('project')
+                    ->andWhere('method')->eq('list')
+                    ->andWhere('`group`')->eq($groupID)
+                    ->exec();
+            }
         }
 
         return true;