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

* Fixed a bug of the wrong user name in company dynamic and user dynamic, and corrected 'Test Case' to 'Test case';

Browse Source
This commit is contained in:
liukmqd@gmail.com
2011-05-04 08:20:35 +00:00
parent c491301ef9
commit 53198ec100
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/company/control.php
+1 -1
View File
@@ -179,7 +179,7 @@ class company extends control
/* Assign. */
$this->view->type = $type;
$this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed');
$this->view->users = $this->loadModel('user')->getPairs('nodeleted|noletter');
$this->view->account = $account;
$this->view->actions = $this->loadModel('action')->getDynamic($account, $period, $orderBy, $pager);
$this->display();
module/company/view/dynamic.html.php
+1 -1
View File
@@ -42,7 +42,7 @@
<?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
<tr class='a-center'>
<td><?php echo $action->date;?></td>
<td><?php echo $app->user->realname;?></td>
<td><?php isset($users[$action->actor]) ? print($users[$action->actor]) : print($action->actor);?></td>
<td><?php echo $action->actionLabel;?></td>
<td><?php echo $lang->action->objectTypes[$action->objectType];?></td>
<td><?php echo $action->objectID;?></td>
module/my/lang/en.php
+1 -1
View File
@@ -7,7 +7,7 @@ $lang->my->todo = 'Todo';
$lang->my->task = 'Task';
$lang->my->bug = 'Bug';
$lang->my->testTask = 'Test task';
$lang->my->testCase = 'Test Case';
$lang->my->testCase = 'Test case';
$lang->my->story = 'Story';
$lang->my->project = 'Project';
$lang->my->team = 'Team';
module/user/control.php
+1 -1
View File
@@ -477,7 +477,7 @@ class user extends control
/* Assign. */
$this->view->period = $period;
$this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed');
$this->view->users = $this->loadModel('user')->getPairs('nodeleted|noletter');
$this->view->account = $account;
$this->view->actions = $this->loadModel('action')->getDynamic($account, $period, $orderBy, $pager);
$this->display();
module/user/view/dynamic.html.php
+6 -7
View File
@@ -26,14 +26,13 @@
</div>
<table class='table-1 colored tablesorter'>
<?php $vars = "orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<thead>
<tr class='colhead'>
<th class='w-150px'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
<th class='w-user'> <?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
<th class='w-100px'><?php common::printOrderLink('action', $orderBy, $vars, $lang->action->action);?></th>
<th class='w-80px'> <?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
<th class='w-id'> <?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-150px'><?php echo $lang->action->date;?></th>
<th class='w-user'> <?php echo $lang->action->actor;?></th>
<th class='w-100px'><?php echo $lang->action->action;?></th>
<th class='w-80px'> <?php echo $lang->action->objectType;?></th>
<th class='w-id'> <?php echo $lang->idAB;?></th>
<th><?php echo $lang->action->objectName;?></th>
</tr>
</thead>
@@ -42,7 +41,7 @@
<?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
<tr class='a-center'>
<td><?php echo $action->date;?></td>
<td><?php echo $app->user->realname;?></td>
<td><?php echo $users[$action->actor];?></td>
<td><?php echo $action->actionLabel;?></td>
<td><?php echo $lang->action->objectTypes[$action->objectType];?></td>
<td><?php echo $action->objectID;?></td>