modified action of add filebox for ajax request

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9009 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-03 09:26:08 +00:00
parent 597e034ca3
commit c7d29a1c42

View file

@ -619,6 +619,7 @@
$logged_info = Context::get('logged_info');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
$ajax = Context::get('ajax');
$vars = Context::gets('comment','addfile','filter');
$module_filebox_srl = Context::get('module_filebox_srl');
@ -644,11 +645,20 @@
$output = $this->insertModuleFileBox($vars);
}
$url = getUrl('','module','module','act','dispModuleFileBox','input',Context::get('input'),'filter',$vars->filter);
$url = html_entity_decode($url);
$vars = Context::set('url',$url);
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('move_filebox_list');
$this->setTemplatePath($this->module_path.'tpl');
if (!$ajax)
{
$url = getUrl('','module','module','act','dispModuleFileBox','input',Context::get('input'),'filter',$vars->filter);
$url = html_entity_decode($url);
$vars = Context::set('url',$url);
$this->setTemplateFile('move_filebox_list');
}
else
{
Context::setRequestMethod('JSON');
$this->add('save_filename', $output->get('save_filename'));
}
}
@ -715,6 +725,7 @@
$args->filesize = $vars->addfile['size'];
$output = executeQuery('module.insertModuleFileBox', $args);
$output->add('save_filename', $save_filename);
return $output;
}