From 76146b0f6318dab5cb9018de8430162857ef4c99 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Wed, 23 Sep 2020 16:07:55 +0800
Subject: [PATCH] * Remove unused code.

---
 module/program/control.php            |  2 +-
 module/program/model.php              | 43 ---------------------------
 module/program/view/pgmgroup.html.php | 10 +++----
 3 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/module/program/control.php b/module/program/control.php
index 93bce2873f..50076fb660 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -1038,7 +1038,7 @@ class program extends control
         $this->view->position[] = $this->lang->group->manageView;
 
         $this->view->group      = $group;
-        $this->view->products   = $this->dao->select('*')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->andWhere('PRJ')->eq($group->PRJ)->orderBy('order_desc')->fetchPairs('id', 'name');
+        $this->view->products   = $this->dao->select('*')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->andWhere('program')->eq($group->PRJ)->orderBy('order_desc')->fetchPairs('id', 'name');
         $this->view->projects   = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq('0')->andWhere('id')->eq($group->PRJ)->orderBy('order_desc')->fetchPairs('id', 'name');
 
         $this->display();
diff --git a/module/program/model.php b/module/program/model.php
index c106a0b8ea..5faea94262 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1,34 +1,6 @@
 <?php
 class programModel extends model
 {
-    /**
-     * Get program list.
-     *
-     * @param  varchar $status
-     * @param  varchar $orderBy
-     * @param  object  $pager
-     * @param  bool    $includeCat
-     * @param  bool    $mine
-     * @access public
-     * @return array
-     */
-    public function getList($status = 'all', $orderBy = 'id_desc', $pager = NULL, $includeCat = false, $mine = false)
-    {
-        return $this->dao->select('*')->from(TABLE_PROGRAM)
-            ->where('type')->eq('program')
-            ->andWhere('deleted')->eq(0)
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->programs)->fi()
-            ->beginIF($status != 'all')->andWhere('status')->eq($status)->fi()
-            ->beginIF($this->cookie->mine or $mine)
-            ->andWhere('openedBy', true)->eq($this->app->user->account)
-            ->orWhere('PM')->eq($this->app->user->account)
-            ->markRight(1)
-            ->fi()
-            ->orderBy($orderBy)
-            ->page($pager)
-            ->fetchAll('id');
-    }
-
     /**
      * Get program pairs.
      *
@@ -44,21 +16,6 @@ class programModel extends model
             ->fetchPairs();
     }
 
-    /**
-     * Get program pairs.
-     *
-     * @access public
-     * @return void
-     */
-    public function getPairs()
-    {
-        return $this->dao->select('id, name')->from(TABLE_PROGRAM)
-            ->where('type')->eq('program')
-            ->andWhere('deleted')->eq(0)
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->programs)->fi()
-            ->fetchPairs();
-    }
-
     /**
      * Get program pairs by template.
      *
diff --git a/module/program/view/pgmgroup.html.php b/module/program/view/pgmgroup.html.php
index 70387ef305..f4a7425542 100644
--- a/module/program/view/pgmgroup.html.php
+++ b/module/program/view/pgmgroup.html.php
@@ -43,12 +43,12 @@
         <td class='c-actions'>
           <?php $lang->group->managepriv = $lang->group->managePrivByGroup;?>
           <?php $disabled = $group->role == 'limited' ? 'disabled' : '';?>
-          <?php common::printIcon('program', 'pgmmanageview', "groupID=$group->id", $group, 'list', 'eye', '', $disabled);?>
-          <?php common::printIcon('program', 'pgmmanagepriv', "type=byGroup&param=$group->id", $group, 'list', 'lock');?>
+          <?php common::printIcon('program', 'PGMManageView', "groupID=$group->id", $group, 'list', 'eye', '', $disabled);?>
+          <?php common::printIcon('program', 'PGMManagePriv', "type=byGroup&param=$group->id", $group, 'list', 'lock');?>
           <?php $lang->group->managemember = $lang->group->manageMember;?>
-          <?php common::printIcon('program', 'pgmmanagegroupmember', "groupID=$group->id", $group, 'list', 'persons', '', 'iframe', 'yes', "data-width='90%'");?>
-          <?php common::printIcon('program', 'pgmeditgroup', "groupID=$group->id", $group, 'list', 'edit', '', 'iframe', 'yes', "data-width='550'");?>
-          <?php common::printIcon('program', 'pgmcopygroup', "groupID=$group->id", $group, 'list', 'copy', '', "iframe $disabled", 'yes', "data-width='550'");?>
+          <?php common::printIcon('program', 'PGMManageGroupMember', "groupID=$group->id", $group, 'list', 'persons', '', 'iframe', 'yes', "data-width='90%'");?>
+          <?php common::printIcon('program', 'PGMEditGroup', "groupID=$group->id", $group, 'list', 'edit', '', 'iframe', 'yes', "data-width='550'");?>
+          <?php common::printIcon('program', 'PGMCopyGroup', "groupID=$group->id", $group, 'list', 'copy', '', "iframe $disabled", 'yes', "data-width='550'");?>
           <?php
           if(common::hasPriv('group', 'delete') and $group->role != 'limited')
           {