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

* fix bug #792.

Browse Source
This commit is contained in:
wangyidong
2016-03-04 11:33:54 +08:00
parent bc18f5d692
commit d9e1606b2e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/action/view/trash.html.php
View File

@@ -37,7 +37,7 @@
<tr class='text-center'>
<td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td>
<td><?php echo $action->objectID;?></td>
<td class='text-left'><?php echo html::a($this->createLink($module, 'view', "id=$action->objectID"), $action->objectName);?></td>
<td class='text-left'><?php echo html::a($this->createLink($module, 'view', $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}"), $action->objectName);?></td>
<td><?php echo $users[$action->actor];?></td>
<td><?php echo $action->date;?></td>
<td>

2
module/user/model.php
View File

@@ -42,6 +42,8 @@ class userModel extends model
*/
public function setUserList($users, $account)
{
$user = $this->getById($account);
if($user->deleted) $users[$account] = zget($user, 'realname', $account);
return html::select('account', $users, $account, "onchange=\"switchAccount(this.value, '{$this->app->getMethodName()}')\" class='form-control chosen'");
}