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

* fix some bugs.

Browse Source
This commit is contained in:
wangyidong
2013-03-13 02:06:45 +00:00
parent 4962843783
commit c24164b3a5
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/company/view/browse.html.php
+2 -2
View File
@@ -37,9 +37,9 @@ js::set('deptID', $deptID);
<th><?php common::printOrderLink('account', $orderBy, $vars, $lang->user->account);?></th>
<th><?php common::printOrderLink('role', $orderBy, $vars, $lang->user->role);?></th>
<th><?php common::printOrderLink('email', $orderBy, $vars, $lang->user->email);?></th>
<th><?php common::printOrderLink('gander', $orderBy, $vars, $lang->user->gender);?></th>
<th><?php common::printOrderLink('gender', $orderBy, $vars, $lang->user->gender);?></th>
<th><?php common::printOrderLink('phone', $orderBy, $vars, $lang->user->phone);?></th>
<th><?php common::printOrderLink('join', $orderBy, $vars, $lang->user->join);?></th>
<th><?php common::printOrderLink('`join`', $orderBy, $vars, $lang->user->join);?></th>
<th><?php common::printOrderLink('last', $orderBy, $vars, $lang->user->last);?></th>
<th><?php common::printOrderLink('visits', $orderBy, $vars, $lang->user->visits);?></th>
<th class='w-80px'><?php echo $lang->actions;?></th>
module/setting/model.php
+1
View File
@@ -178,6 +178,7 @@ class settingModel extends model
foreach($records as $record)
{
if(!isset($record->module)) return array(); // If no module field, return directly. Since 3.2 version, there's the module field.
if(empty($record->module)) continue;
if($record->section) $config[$record->owner]->{$record->module}[] = $record;
if(!$record->section) $config[$record->owner]->{$record->module}[] = $record;
module/upgrade/model.php
+17
View File
@@ -419,18 +419,35 @@ class upgradeModel extends model
->fetchAll();
foreach($groups as $group)
{
$this->dao->delete()->from(TABLE_GROUPPRIV)
->where('`group`')->eq($group->group)
->andWhere('module')->eq('task')
->andWhere('method')->eq('recordEstimate')
->exec(false);
$this->dao->insert(TABLE_GROUPPRIV)
->set('company')->eq($group->company)
->set('`group`')->eq($group->group)
->set('module')->eq('task')
->set('method')->eq('recordEstimate')
->exec();
$this->dao->delete()->from(TABLE_GROUPPRIV)
->where('`group`')->eq($group->group)
->andWhere('module')->eq('task')
->andWhere('method')->eq('editEstimate')
->exec(false);
$this->dao->insert(TABLE_GROUPPRIV)
->set('company')->eq($group->company)
->set('`group`')->eq($group->group)
->set('module')->eq('task')
->set('method')->eq('editEstimate')
->exec();
$this->dao->delete()->from(TABLE_GROUPPRIV)
->where('`group`')->eq($group->group)
->andWhere('module')->eq('task')
->andWhere('method')->eq('deleteEstimate')
->exec(false);
$this->dao->insert(TABLE_GROUPPRIV)
->set('company')->eq($group->company)
->set('`group`')->eq($group->group)