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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2018-09-17 09:18:19 +08:00
parent 2f5a511644 500f39e290
commit 17d997c44e
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+1 -5
View File
@@ -1016,11 +1016,7 @@ class block extends control
$today = date(DT_DATE1);
$yesterday = date(DT_DATE1, strtotime('yesterday'));
$this->app->loadLang('bug');
$bugs = $this->dao->select('id, assignedTo, resolvedDate, closedDate, status')->from(TABLE_BUG)
->where('deleted')->eq(0)
->andWhere('id')->in($bugIDList)
->fetchAll('id');
$bugs = $this->loadModel('bug')->getByList($bugIDList, 'id, assignedTo, resolvedDate, closedDate, status');
$confirmedBugs = $this->dao->select('objectID')->from(TABLE_ACTION)
->where('objectType')->eq('bug')
->andWhere('action')->eq('bugconfirmed')
module/bug/model.php
+3 -2
View File
@@ -477,12 +477,13 @@ class bugModel extends model
* Get bug list.
*
* @param int|array|string $bugIDList
* @param string $fields
* @access public
* @return array
*/
public function getByList($bugIDList = 0)
public function getByList($bugIDList = 0, $fields = '*')
{
return $this->dao->select('*')->from(TABLE_BUG)
return $this->dao->select($fields)->from(TABLE_BUG)
->where('deleted')->eq(0)
->beginIF($bugIDList)->andWhere('id')->in($bugIDList)->fi()
->fetchAll('id');
module/entry/view/browse.html.php
+2 -2
View File
@@ -19,9 +19,9 @@
<tr>
<?php $vars = "orderBy=%s&recTotal=$pager->recTotal&recPerPage=$pager->recPerPage&pageID=$pager->pageID";?>
<th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->entry->id);?></th>
<th class='w-200px'><?php common::printOrderLink('name', $orderBy, $vars, $lang->entry->name);?></th>
<th><?php common::printOrderLink('name', $orderBy, $vars, $lang->entry->name);?></th>
<th class='w-100px'><?php common::printOrderLink('code', $orderBy, $vars, $lang->entry->code);?></th>
<th class='w-200px'><?php common::printOrderLink('key', $orderBy, $vars, $lang->entry->key);?></th>
<th class='w-280px'><?php common::printOrderLink('key', $orderBy, $vars, $lang->entry->key);?></th>
<th class='w-200px'><?php common::printOrderLink('ip', $orderBy, $vars, $lang->entry->ip);?></th>
<th><?php echo common::printOrderLink('desc', $orderBy, $vars, $lang->entry->desc);?></th>
<th class='c-actions-3'><?php echo $lang->actions;?></th>