Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Modify the variables of the issue module.

Browse Source
This commit is contained in:
tianshujie98
2020-12-17 11:09:55 +08:00
parent 6d61bc7129
commit 68c5c8b360
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/issue/lang/de.php
+1 -1
View File
@@ -12,7 +12,7 @@
$lang->issue->common = 'Issue';
$lang->issue->browse = 'List';
$lang->issue->resolvedBy = 'Resolved By';
$lang->issue->program = 'Linked Project';
$lang->issue->project = 'Linked Project';
$lang->issue->title = 'Title';
$lang->issue->desc = 'Description';
$lang->issue->pri = 'Priority';
module/issue/lang/en.php
+1 -1
View File
@@ -12,7 +12,7 @@
$lang->issue->common = 'Issue';
$lang->issue->browse = 'List';
$lang->issue->resolvedBy = 'Resolved By';
$lang->issue->program = 'Linked Project';
$lang->issue->project = 'Linked Project';
$lang->issue->title = 'Title';
$lang->issue->desc = 'Description';
$lang->issue->pri = 'Priority';
module/issue/lang/fr.php
+1 -1
View File
@@ -12,7 +12,7 @@
$lang->issue->common = 'Issue';
$lang->issue->browse = 'List';
$lang->issue->resolvedBy = 'Resolved By';
$lang->issue->program = 'Linked Project';
$lang->issue->project = 'Linked Project';
$lang->issue->title = 'Title';
$lang->issue->desc = 'Description';
$lang->issue->pri = 'Priority';
module/issue/lang/vi.php
+1 -1
View File
@@ -12,7 +12,7 @@
$lang->issue->common = 'Issue';
$lang->issue->browse = 'List';
$lang->issue->resolvedBy = 'Resolved By';
$lang->issue->program = 'Linked Project';
$lang->issue->project = 'Linked Project';
$lang->issue->title = 'Title';
$lang->issue->desc = 'Description';
$lang->issue->pri = 'Priority';
module/issue/lang/zh-cn.php
+1 -1
View File
@@ -12,7 +12,7 @@
$lang->issue->common = '问题';
$lang->issue->browse = '问题列表';
$lang->issue->resolvedBy = '解决者';
$lang->issue->program = '所属项目';
$lang->issue->project = '所属项目';
$lang->issue->title = '标题';
$lang->issue->desc = '描述';
$lang->issue->pri = '优先级';
module/issue/lang/zh-tw.php
+1 -1
View File
@@ -12,7 +12,7 @@
$lang->issue->common = '問題';
$lang->issue->browse = '問題列表';
$lang->issue->resolvedBy = '解決者';
$lang->issue->program = '所屬項目';
$lang->issue->project = '所屬項目';
$lang->issue->title = '標題';
$lang->issue->desc = '描述';
$lang->issue->pri = '優先順序';
module/issue/model.php
+6 -6
View File
@@ -80,7 +80,7 @@ class issueModel extends model
/**
* Get issue list data.
*
* @param int $programID
* @param int $projectID
* @param string $browseType bySearch|open|assignTo|closed|suspended|canceled
* @param int $queryID
* @param string $orderBy
@@ -88,7 +88,7 @@ class issueModel extends model
* @access public
* @return object
*/
public function getList($programID = 0, $browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null)
public function getList($projectID = 0, $browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null)
{
$issueQuery = '';
if($browseType == 'bysearch')
@@ -105,7 +105,7 @@ class issueModel extends model
$issueList = $this->dao->select('*')->from(TABLE_ISSUE)
->where('deleted')->eq('0')
->beginIF($programID)->andWhere('PRJ')->eq($programID)->fi()
->beginIF($projectID)->andWhere('PRJ')->eq($projectID)->fi()
->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()
@@ -122,18 +122,18 @@ class issueModel extends model
/**
* Get the issue in the block.
*
* @param int $programID
* @param int $projectID
* @param string $browseType open|assignto|closed|suspended|canceled
* @param int $limit
* @param string $orderBy
* @access public
* @return array
*/
public function getBlockIssues($programID = 0, $browseType = 'all', $limit = 15, $orderBy = 'id_desc')
public function getBlockIssues($projectID = 0, $browseType = 'all', $limit = 15, $orderBy = 'id_desc')
{
$issueList = $this->dao->select('*')->from(TABLE_ISSUE)
->where('deleted')->eq('0')
->beginIF($programID)->andWhere('PRJ')->eq($programID)->fi()
->beginIF($projectID)->andWhere('PRJ')->eq($projectID)->fi()
->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()