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

* Finish task #86269.

Browse Source
This commit is contained in:
liumengyi
2023-03-10 01:14:28 +00:00
parent d15d23647d
commit 706ed8a348
8 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/control.php
+9 -1
View File
@@ -431,7 +431,15 @@ class group extends control
$queryID = ($browseType == 'bysearch') ? (int)$paramID : 0;
$actionURL = $this->createLink('group', 'editManagePriv', "browseType=bysearch&view=&paramID=myQueryID&recTotal=$recTotal&recPerPage=$recPerPage");
$this->group->buildPrivSearchForm($queryID, $actionURL);
$this->view->pager = $pager;
$privRelations = array();
$privRelations['recommend'] = $this->group->getPrivRelationPairs(array_keys($privList), 'recommend');
$privRelations['recommend'] = implode(',', $privRelations['recommend']);
$privRelations['dependent'] = $this->group->getPrivRelationPairs(array_keys($privList), 'dependent');
$privRelations['dependent'] = implode(',', $privRelations['dependent']);
$this->view->pager = $pager;
$this->view->privRelations = $privRelations;
}
$this->view->title = $this->lang->group->editManagePriv;
module/group/css/editmanagepriv.css
+2 -1
View File
@@ -22,7 +22,8 @@
.tree ul > li {display: inline-block; width: 50%;}
.priv-item > .icon {padding-left: 5px;}
#privList .c-name {min-width: 100px;}
#privList .c-view, #privList .c-module, #privList .c-package {width: 100px;}
#privList .c-privs {width: 180px;}
#privList .c-privs {min-width: 180px;}
#privList .c-actions {width: 50px;}
#privList tbody tr td {overflow: hidden; white-space: nowrap;}
module/group/lang/de.php
+2
View File
@@ -64,6 +64,8 @@ $lang->group->sortPrivPackages = 'Sort Priv Package';
$lang->group->addRecommendation = 'Add Recommendation';
$lang->group->selectedPrivs = 'Selected Privilege: %s';
$lang->group->selectModule = 'Select Module';
$lang->group->recommendPrivs = 'Recommended Privs';
$lang->group->DependentPrivs = 'Dependented Privs';
$lang->group->id = 'ID';
$lang->group->name = 'Name';
module/group/lang/en.php
+2
View File
@@ -64,6 +64,8 @@ $lang->group->sortPrivPackages = 'Sort Priv Package';
$lang->group->addRecommendation = 'Add Recommendation';
$lang->group->selectedPrivs = 'Selected Privilege: %s';
$lang->group->selectModule = 'Select Module';
$lang->group->recommendPrivs = 'Recommended Privs';
$lang->group->DependentPrivs = 'Dependented Privs';
$lang->group->id = 'ID';
$lang->group->name = 'Group';
module/group/lang/fr.php
+2
View File
@@ -64,6 +64,8 @@ $lang->group->sortPrivPackages = 'Sort Priv Package';
$lang->group->addRecommendation = 'Add Recommendation';
$lang->group->selectedPrivs = 'Selected Privilege: %s';
$lang->group->selectModule = 'Select Module';
$lang->group->recommendPrivs = 'Recommended Privs';
$lang->group->DependentPrivs = 'Dependented Privs';
$lang->group->id = 'ID';
$lang->group->name = 'Groupe';
module/group/lang/zh-cn.php
+2
View File
@@ -64,6 +64,8 @@ $lang->group->sortPrivPackages = '权限包排序';
$lang->group->addRecommendation = '添加推荐';
$lang->group->selectedPrivs = '选中权限：%s';
$lang->group->selectModule = '选择模块';
$lang->group->recommendPrivs = '依赖权限';
$lang->group->DependentPrivs = '推荐权限';
$lang->group->id = '编号';
$lang->group->name = '分组名称';
module/group/model.php
+20
View File
@@ -1178,6 +1178,26 @@ class groupModel extends model
->fetchAll('id');
}
/**
* Get priv relation.
*
* @param int $priv
* @param string $type
* @param string $module
* @access public
* @return array
*/
public function getPrivRelationPairs($priv, $type = '', $module = '')
{
return $this->dao->select('t2.id,t3.name')->from(TABLE_PRIVRELATION)->alias('t1')
->leftJoin(TABLE_PRIV)->alias('t2')->on('t1.relationPriv=t2.id')
->leftJoin(TABLE_PRIVLANG)->alias('t3')->on('t2.id=t3.priv')
->where('t1.priv')->in($priv)
->beginIF(!empty($type))->andWhere('t1.type')->eq($type)->fi()
->beginIF($module)->andWhere('t2.module')->eq($module)->fi()
->fetchPairs();
}
/**
* Save relation.
*
module/group/view/editmanageprivbylist.html.php
+4 -2
View File
@@ -25,6 +25,7 @@ $lang->privp->p2 = '推荐权限';
<th class="c-package"><?php echo $lang->privpackage->belong;?></th>
<th class="c-privs"><?php echo $lang->privp->p1;?></th>
<th class="c-privs"><?php echo $lang->privp->p2;?></th>
<th class="c-desc"><?php echo $lang->group->privDesc;?></th>
<th class="c-actions-1 text-center"><?php echo $lang->actions;?></th>
</tr>
</thead>
@@ -36,8 +37,9 @@ $lang->privp->p2 = '推荐权限';
<td title='<?php echo isset($lang->{$view}->common) ? $lang->{$view}->common : $view;?>'><?php echo isset($lang->{$view}->common) ? $lang->{$view}->common : $view;?></td>
<td title='<?php echo isset($moduleLang[$priv->module]) ? $moduleLang[$priv->module] : $priv->module;?>'><?php echo isset($moduleLang[$priv->module]) ? $moduleLang[$priv->module] : $priv->module;?></td>
<td title='<?php echo zget($packages, $priv->package, '');?>'><?php echo zget($packages, $priv->package, '');?></td>
<td title='<?php echo '';?>'><?php echo '';?></td>
<td title='<?php echo '';?>'><?php echo '';?></td>
<td title='<?php echo zget($privRelations['recommend'], $priv->id);?>'><?php echo zget($privRelations['recommend'], $priv->id);?></td>
<td title='<?php echo zget($privRelations['dependent'], $priv->id);?>'><?php echo zget($privRelations['dependent'], $priv->id);?></td>
<td title='<?php echo $priv->desc;?>'><?php echo $priv->desc;?></td>
<td class='c-actions'><?php if(common::hasPriv('group', 'editPriv')) common::printIcon('group', 'editPriv', "privID=$priv->id", '', 'list', 'edit', '', 'iframe', true);?></td>
</tr>
<?php endforeach;?>