Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x

module/block/model.php

@@ -702,6 +702,32 @@ class blockModel extends model
         return $key == $hash;
     }
 
+    /** 
+     * Get cmmi issue params.
+     *
+     * @param  string $module▫
+     * @access public
+     * @return void
+     */
+    public function getCmmiissueParams($module = '') 
+    {
+        $this->app->loadLang('issue');
+        $params = new stdclass();
+        $params->type['name']    = $this->lang->block->type;
+        $params->type['options'] = $this->lang->issue->labelList;
+        $params->type['control'] = 'select';
+
+        $params->num['name']    = $this->lang->block->num;
+        $params->num['default'] = 20;
+        $params->num['control'] = 'input';
+
+        $params->orderBy['name']    = $this->lang->block->orderBy;
+        $params->orderBy['options'] = $this->lang->block->orderByList->product;
+        $params->orderBy['control'] = 'select';
+
+        return json_encode($params);
+    }
+
     /** 
      * Get testtask params.
      *▫

module/issue/model.php

@@ -88,6 +88,11 @@ class issueModel extends model
         $issueList = $this->dao->select('*')->from(TABLE_ISSUE)
             ->where('program')->eq($this->session->program)
             ->andWhere('deleted')->eq('0')
+            ->beginIF($browseType == 'open')->andWhere('status')->eq('active')->fi()
+            ->beginIF($browseType == 'assignto')->andWhere('assignedTo')->eq($this->app->user->account)->fi()
+            ->beginIF($browseType == 'closed')->andWhere('status')->eq('closed')->fi()
+            ->beginIF($browseType == 'suspended')->andWhere('status')->eq('suspended')->fi()
+            ->beginIF($browseType == 'cancelled')->andWhere('status')->eq('canceled')->fi()
             ->orderBy($orderBy)
             ->limit($limit)
             ->fetchAll();