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

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

Browse Source
This commit is contained in:
dajiao007
2018-07-09 15:01:16 +08:00
parent efa539736c 765942f3c4
commit 0b0146cfb5
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/company/css/browse.css
+2
View File
@@ -2,3 +2,5 @@
form {position:relative}
#querybox {float: none!important; width: auto;}
#moreOrLite {right: 10px!important}
#userList tbody td{white-space: nowrap; overflow:hidden}
module/company/view/browse.html.php
+2 -2
View File
@@ -70,7 +70,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
</th>
<th><?php common::printorderlink('realname', $orderBy, $vars, $lang->user->realname);?></th>
<th><?php common::printOrderLink('account', $orderBy, $vars, $lang->user->account);?></th>
<th class="c-type"><?php common::printOrderLink('role', $orderBy, $vars, $lang->user->role);?></th>
<th class="w-90px"><?php common::printOrderLink('role', $orderBy, $vars, $lang->user->role);?></th>
<th class="c-url"><?php common::printOrderLink('email', $orderBy, $vars, $lang->user->email);?></th>
<th class="c-type"><?php common::printOrderLink('gender', $orderBy, $vars, $lang->user->gender);?></th>
<th><?php common::printOrderLink('phone', $orderBy, $vars, $lang->user->phone);?></th>
@@ -92,7 +92,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
</td>
<td><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname, '', "title='$user->realname'")) echo $user->realname;?></td>
<td><?php echo $user->account;?></td>
<td class="c-type"><?php echo zget($lang->user->roleList, $user->role, '');?></td>
<td class="w-90px" title='<?php echo zget($lang->user->roleList, $user->role, '');?>'><?php echo zget($lang->user->roleList, $user->role, '');?></td>
<td class="c-url" title="<?php echo $user->email;?>"><?php echo html::mailto($user->email);?></td>
<td class="c-type"><?php echo zget($lang->user->genderList, $user->gender, $user->gender);?></td>
<td><?php echo $user->phone;?></td>
module/task/model.php
+3 -3
View File
@@ -1123,7 +1123,7 @@ class taskModel extends model
->setDefault('status', 'done')
->setDefault('finishedBy, lastEditedBy', $this->app->user->account)
->setDefault('finishedDate, lastEditedDate', $now)
->removeIF(!empty($oldTask->team), 'finishedBy,finishedDate,status')
->removeIF(!empty($oldTask->team), 'finishedBy,finishedDate,status,left')
->remove('comment,files,labels')
->get();
@@ -1145,8 +1145,8 @@ class taskModel extends model
}
else
{
$consumed = $oldTask->team[$this->app->user->account]->consumed;
if($task->consumed < $consumed)
$consumed = $task->consumed - $oldTask->team[$this->app->user->account]->consumed;
if($consumed < 0)
{
dao::$errors[] = $this->lang->task->error->consumedSmall;
return false;