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

* finish task #1166.

Browse Source
This commit is contained in:
wangyidong
2013-03-13 04:18:27 +00:00
parent 149e3b11a1
commit abbe7d1e4b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/company/view/browse.html.php
+1 -1
View File
@@ -62,7 +62,7 @@ js::set('deptID', $deptID);
<td class='a-center'>
<?php
common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'list');
common::printIcon('user', 'delete', "userID=$user->id", '', 'list', '', "hiddenwin");
if(strpos($this->app->company->admins, ",{$this->app->user->account},") === false or $this->app->user->account != $user->account) common::printIcon('user', 'delete', "userID=$user->id", '', 'list', '', "hiddenwin");
if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
{
common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', '', "hiddenwin");
module/user/control.php
+2
View File
@@ -399,6 +399,8 @@ class user extends control
{
if($confirm == 'no')
{
$user = $this->user->getByID($userID);
if(strpos($this->app->company->admins, ",{$this->app->user->account},") !== false and $this->app->user->account == $user->account) return;
die(js::confirm($this->lang->user->confirmDelete, $this->createLink('user', 'delete', "userID=$userID&confirm=yes")));
}
else