From b4af7ae0025bfb3f044992e64a09b0a6c29db789 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 25 Mar 2021 09:47:06 +0800
Subject: [PATCH] * Fix the problem of project list operation.

---
 module/project/control.php         |  7 ++++++-
 module/project/model.php           | 11 +++++------
 module/project/view/group.html.php |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 760b4d0a74..31b7bfebed 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -891,6 +891,7 @@ class project extends control
      */
     public function manageView($groupID, $projectID, $programID)
     {
+        $this->loadModel('group');
         if($_POST)
         {
             $this->group->updateView($groupID);
@@ -924,6 +925,7 @@ class project extends control
      */
     public function managePriv($type = 'byGroup', $param = 0, $menu = '', $version = '')
     {
+        $this->loadModel('group');
         if($type == 'byGroup')
         {
             $groupID = $param;
@@ -1030,6 +1032,7 @@ class project extends control
      */
     public function manageGroupMember($groupID, $deptID = 0)
     {
+        $this->loadModel('group');
         if(!empty($_POST))
         {
             $this->group->updateUser($groupID);
@@ -1065,6 +1068,7 @@ class project extends control
      */
     public function copyGroup($groupID)
     {
+        $this->loadModel('group');
         if(!empty($_POST))
          {
              $group = $this->group->getByID($groupID);
@@ -1090,7 +1094,8 @@ class project extends control
      */
     public function editGroup($groupID)
     {
-       if(!empty($_POST))
+        $this->loadModel('group');
+        if(!empty($_POST))
         {
             $this->group->update($groupID);
             die(js::closeModal('parent.parent', 'this'));
diff --git a/module/project/model.php b/module/project/model.php
index b38ff253fe..13d4cf924f 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1336,18 +1336,17 @@ class projectModel extends model
                     }
 
                     $from    = $project->from == 'project' ? 'project' : 'pgmproject';
-                    $openApp = $this->app->openApp;
-                    common::printIcon('project', 'edit', "projectID=$project->id&from=$from", $project, 'list', 'edit', '', '', '', "data-app=$openApp", '', $project->id);
-                    common::printIcon('project', 'manageMembers', "projectID=$project->id", $project, 'list', 'group', '', '', '', '', $this->lang->execution->team, $project->id);
-                    if($this->config->systemMode == 'new') common::printIcon('project', 'group', "projectID=$project->id&programID=$programID", $project, 'list', 'lock', '', '', '', '', '', $project->id);
+                    common::printIcon('project', 'edit', "projectID=$project->id&from=$from", $project, 'list', 'edit', '', '', '', "data-app=project", '', $project->id);
+                    common::printIcon('project', 'manageMembers', "projectID=$project->id", $project, 'list', 'group', '', '', '', "data-app=project", $this->lang->execution->team, $project->id);
+                    if($this->config->systemMode == 'new') common::printIcon('project', 'group', "projectID=$project->id&programID=$programID", $project, 'list', 'lock', '', '', '', "data-app=project", '', $project->id);
 
                     if(common::hasPriv('project','manageProducts') || common::hasPriv('project', 'whitelist') || common::hasPriv('project', 'delete'))
                     {
                         echo "<div class='btn-group'>";
                         echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-more-alt'></i></button>";
                         echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
-                        common::printIcon('project', 'manageProducts', "projectID=$project->id&programID=$programID", $project, 'list', 'link', '', 'btn-action', '', "data-app=$openApp", $this->lang->project->manageProducts, $project->id);
-                        if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&programID=$programID&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', "data-app=$openApp", '', $project->id);
+                        common::printIcon('project', 'manageProducts', "projectID=$project->id&programID=$programID", $project, 'list', 'link', '', 'btn-action', '', "data-app=project", $this->lang->project->manageProducts, $project->id);
+                        if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', "data-app=project", '', $project->id);
                         if(common::hasPriv('project','delete')) echo html::a(inLink("delete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn btn-action' title='{$this->lang->project->delete}'");
                         echo "</ul>";
                         echo "</div>";
diff --git a/module/project/view/group.html.php b/module/project/view/group.html.php
index 7a0c169a7b..9ac440c021 100644
--- a/module/project/view/group.html.php
+++ b/module/project/view/group.html.php
@@ -45,7 +45,7 @@
           <?php $lang->group->managepriv = $lang->group->managePrivByGroup;?>
           <?php $disabled = $group->role == 'limited' ? 'disabled' : '';?>
           <?php common::printIcon('project', 'manageView', "groupID=$group->id&projectID=$projectID&programID=$project->parent", $group, 'list', 'eye', '', $disabled);?>
-          <?php common::printIcon('project', 'managePriv', "type=byGroup&param=$group->id", $group, 'list', 'lock');?>
+          <?php common::printIcon('project', 'managePriv', "type=byGroup&param=$group->id", $group, 'list', 'lock', '', '', '', "data-app='project'");?>
           <?php $lang->group->managemember = $lang->group->manageMember;?>
           <?php common::printIcon('project', 'manageGroupMember', "groupID=$group->id", $group, 'list', 'persons', '', 'iframe', 'yes', "data-width='90%'");?>
           <?php common::printIcon('project', 'editGroup', "groupID=$group->id", $group, 'list', 'edit', '', 'iframe', 'yes', "data-width='550'");?>