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

* Fix bug of view history privs.

Browse Source
This commit is contained in:
liumengyi
2023-04-11 16:34:57 +08:00
parent 4e05ed02ed
commit 5e2c0f9c1f
3 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/control.php
+10 -7
View File
@@ -199,25 +199,25 @@ class group extends control
*/
public function managePriv($type = 'byGroup', $param = 0, $menu = '', $version = '')
{
if($type == 'byGroup') $groupID = $param;
if($type == 'byGroup' or $type == 'byPackage') $groupID = $param;
$this->view->type = $type;
foreach($this->lang->resource as $moduleName => $action)
{
if($this->group->checkMenuModule($menu, $moduleName) or $type != 'byGroup') $this->app->loadLang($moduleName);
if($this->group->checkMenuModule($menu, $moduleName) or ($type != 'byGroup' and $type != 'byPackage')) $this->app->loadLang($moduleName);
}
if(!empty($_POST))
{
if($type == 'byGroup') $result = $this->group->updatePrivByGroup($groupID, $menu, $version);
if($type == 'byGroup' or $type == 'byPackage') $result = $this->group->updatePrivByGroup($groupID, $menu, $version);
if($type == 'byModule') $result = $this->group->updatePrivByModule();
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
if($type == 'byGroup') return $this->send(array('result' => 'success', 'message' => ($result ? $this->lang->group->dependPrivsSaveTip : $this->lang->saveSuccess), 'locate' => 'reload'));
if($type == 'byGroup' or $type == 'byPackage') return $this->send(array('result' => 'success', 'message' => ($result ? $this->lang->group->dependPrivsSaveTip : $this->lang->saveSuccess), 'locate' => 'reload'));
if($type == 'byModule') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
}
if($type == 'byGroup')
if($type == 'byGroup' or $type == 'byPackage')
{
$this->group->sortResource();
$group = $this->group->getById($groupID);
@@ -234,12 +234,12 @@ class group extends control
{
if(version_compare($currentVersion, $realVersion, '>=')) $changelog[] = join(',', $currentChangeLog);
}
$changelogs = ',' . join(',', $changelog) . ',';
$this->lang->custom->common = $this->lang->group->config;
if($this->config->edition == 'max' and $this->config->vision == 'rnd' and isset($this->lang->baseline)) $this->lang->baseline->common = $this->lang->group->docTemplate;
$this->view->group = $group;
$this->view->changelogs = ',' . join(',', $changelog) . ',';
$this->view->groupPrivs = $groupPrivs;
$this->view->groupID = $groupID;
$this->view->menu = $menu;
@@ -256,6 +256,8 @@ class group extends control
$selectedPrivIdList = array();
foreach($privs as $priv)
{
if(!empty($version) and strpos($changelogs, ",{$priv->module}-{$priv->method},") === false) continue;
if(!isset($privList[$priv->parentCode])) $privList[$priv->parentCode] = array();
if(!isset($privList[$priv->parentCode][$priv->parent])) $privList[$priv->parentCode][$priv->parent] = array();
$privList[$priv->parentCode][$priv->parent][$priv->key] = $priv;
@@ -272,7 +274,8 @@ class group extends control
}
}
$unassignedModule = array_diff(array_keys(get_object_vars($this->lang->resource)), array_keys($privList));
$modules = $this->group->getMenuModules($menu, false);
$unassignedModule = array_diff(array_keys(get_object_vars($this->lang->resource)), array_keys($modules));
foreach($unassignedModule as $index => $module)
{
if(!$this->group->checkMenuModule($menu, $module)) continue;
module/group/view/managepriv.html.php
+1
View File
@@ -13,5 +13,6 @@
<?php
include '../../common/view/header.html.php';
if($type == 'byGroup') include 'privbygroup.html.php';
if($type == 'byPackage') include 'privbypackage.html.php';
if($type == 'byModule') include 'privbymodule.html.php';
include '../../common/view/footer.html.php';
module/group/view/privbygroup.html.php
-18
View File
@@ -93,24 +93,6 @@
<?php
$moduleActions = !empty($lang->resource->{$moduleName}) ? $lang->resource->{$moduleName} : null;
/* Check method in select version. */
if($version)
{
$hasMethod = false;
foreach($privMethods as $module => $methods)
{
foreach($methods as $method)
{
if(strpos($changelogs, ",$module-$method,") !== false)
{
$hasMethod = true;
break;
}
if(!$hasMethod) continue;
}
}
}
$i = 1;
$modulePrivs = count($privList[$moduleName], 1) - count($selectPrivs[$moduleName], 1);