#19705602 module related DB select column arrangement

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8358 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-05-11 04:52:43 +00:00
parent 914f4d7ef0
commit ee276fe56e
30 changed files with 133 additions and 78 deletions

View file

@ -1024,7 +1024,8 @@ class documentController extends document {
}
// Check permissions
$oModuleModel = &getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) return new Object(-1,'msg_not_permitted');
@ -1079,7 +1080,8 @@ class documentController extends document {
$source_category = $oDocumentModel->getCategory($source_category_srl);
// Check permissions
$oModuleModel = &getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl);
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) return new Object(-1,'msg_not_permitted');
// First child of the parent_category_srl
@ -1134,7 +1136,8 @@ class documentController extends document {
$oDB->begin();
// Check permissions
$oModuleModel = &getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) return new Object(-1,'msg_not_permitted');
@ -1171,7 +1174,8 @@ class documentController extends document {
$module_srl = Context::get('module_srl');
// Check permissions
$oModuleModel = &getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) return new Object(-1,'msg_not_permitted');
@ -1188,7 +1192,8 @@ class documentController extends document {
if(!$module_srl) return false;
// Get module information (to obtain mid)
$oModuleModel = &getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
$columnList = array('module_srl', 'mid', 'site_srl');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
$mid = $module_info->mid;
if(!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category');