From 87cc537eb24f49993198ec2ba2687371bb85cedd Mon Sep 17 00:00:00 2001 From: devjin Date: Thu, 30 Aug 2012 12:03:32 +0000 Subject: [PATCH] issue 2123 added an error message. git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11127 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/module/module.admin.controller.php | 26 +++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index 05889485a..b5fffe4ae 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -138,7 +138,10 @@ // Copy a module $triggerObj->originModuleSrl = $module_srl; $triggerObj->moduleSrlList = array(); - foreach($clones as $mid => $browser_title) { + + $errorLog = array(); + foreach($clones as $mid => $browser_title) + { $clone_args = null; $clone_args = clone($module_info); $clone_args->module_srl = null; @@ -148,6 +151,12 @@ $clone_args->is_default = 'N'; // Create a module $output = $oModuleController->insertModule($clone_args); + + if(!$output->toBool()) + { + $errorLog[] = $mid . ' : '. $output->message; + continue; + } $module_srl = $output->get('module_srl'); if($module_info->module == 'page' && $extra_vars->page_type == 'ARTICLE') @@ -185,11 +194,22 @@ $output = ModuleHandler::triggerCall('module.procModuleAdminCopyModule', 'after', $triggerObj); $oDB->commit(); - $this->setMessage('success_registed'); + + if(count($errorLog) > 0) + { + $message = implode('\n', $errorLog); + $this->setMessage($message); + } + else + { + $mseeage = $lang->success_registed; + $this->setMessage('success_registed'); + } + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { global $lang; htmlHeader(); - alertScript($lang->success_registed); + alertScript($message); reload(true); closePopupScript(); htmlFooter();