fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-12 15:02:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Clean up editor module

Browse source
This commit is contained in:
Kijin Sung 2020-07-09 16:37:04 +09:00
parent d4c449c2a6
commit 143600306d
8 changed files with 215 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/editor/editor.controller.php
View file

@ -93,18 +93,17 @@ class editorController extends editor
$target_module_srl = array_map('trim', explode(',', $target_module_srl));
$logged_info = Context::get('logged_info');
$module_srl = array();
$oModuleModel = getModel('module');
foreach ($target_module_srl as $srl)
{
if (!$srl) continue;
$module_info = $oModuleModel->getModuleInfoByModuleSrl($srl);
$module_info = ModuleModel::getModuleInfoByModuleSrl($srl);
if (!$module_info->module_srl)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$module_grant = $oModuleModel->getGrant($module_info, $logged_info);
$module_grant = ModuleModel::getGrant($module_info, $logged_info);
if (!$module_grant->manager)
{
throw new Rhymix\Framework\Exceptions\NotPermitted;
@ -220,7 +219,7 @@ class editorController extends editor
if ($editor_config)
{
$default_font_config = $this->default_font_config;
$default_font_config = self::$default_font_config;
if ($editor_config->content_font) $default_font_config['default_font_family'] = $editor_config->content_font;
if ($editor_config->content_font_size) $default_font_config['default_font_size'] = $editor_config->content_font_size;
if ($editor_config->content_line_height) $default_font_config['default_line_height'] = $editor_config->content_line_height;
@ -230,7 +229,7 @@ class editorController extends editor
}
else
{
Context::set('default_font_config', $this->default_font_config);
Context::set('default_font_config', self::$default_font_config);
}
}
@ -381,8 +380,7 @@ class editorController extends editor
return;
}
$oDocumentModel = getModel('document');
$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
$oSaved = DocumentModel::getDocument($saved_doc->document_srl);
if(!$oSaved->isExists())
{
if($mode)
@ -512,8 +510,7 @@ class editorController extends editor
function triggerCopyModule(&$obj)
{
$oModuleModel = getModel('module');
$editorConfig = $oModuleModel->getModulePartConfig('editor', $obj->originModuleSrl);
$editorConfig = ModuleModel::getModulePartConfig('editor', $obj->originModuleSrl);
$oModuleController = getController('module');
if(is_array($obj->moduleSrlList))