mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-05-11 21:12:15 +09:00
issue 331 fix
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9618 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
2d2aed374a
commit
5dee02c11d
1 changed files with 8 additions and 2 deletions
|
|
@ -135,7 +135,11 @@
|
||||||
$grant = $oModuleModel->getGrant($request_module, $logged_info);
|
$grant = $oModuleModel->getGrant($request_module, $logged_info);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$grant = $oModuleModel->getGrant($module_info, $logged_info, $xml_info);
|
// have at least access grant
|
||||||
|
if ($this->module == $module_info->module)
|
||||||
|
$grant = $oModuleModel->getGrant($module_info, $logged_info, $xml_info);
|
||||||
|
else
|
||||||
|
$grant->access = 1;
|
||||||
}
|
}
|
||||||
// display no permission if the current module doesn't have an access privilege
|
// display no permission if the current module doesn't have an access privilege
|
||||||
//if(!$grant->access) return $this->stop("msg_not_permitted");
|
//if(!$grant->access) return $this->stop("msg_not_permitted");
|
||||||
|
|
@ -293,7 +297,9 @@
|
||||||
|
|
||||||
if(isset($this->xml_info->action->{$this->act}) && method_exists($this, $this->act)) {
|
if(isset($this->xml_info->action->{$this->act}) && method_exists($this, $this->act)) {
|
||||||
// Check permissions
|
// Check permissions
|
||||||
if(!$this->grant->access) return $this->stop("msg_not_permitted_act");
|
if(!$this->grant->access){
|
||||||
|
return $this->stop("msg_not_permitted_act");
|
||||||
|
}
|
||||||
// integrate skin information of the module(change to sync skin info with the target module only by seperating its table)
|
// integrate skin information of the module(change to sync skin info with the target module only by seperating its table)
|
||||||
$oModuleModel = &getModel('module');
|
$oModuleModel = &getModel('module');
|
||||||
$oModuleModel->syncSkinInfoToModuleInfo($this->module_info);
|
$oModuleModel->syncSkinInfoToModuleInfo($this->module_info);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue