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

rollback r10123

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10127 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-02-15 10:26:32 +00:00
parent 35a365af51
commit 9542921096
4 changed files with 3 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.inc.php
View file

@ -13,7 +13,7 @@
* @brief display XE's full version * @brief display XE's full version
* Even The file should be revised when releasing altough no change is made * Even The file should be revised when releasing altough no change is made
**/ **/
define('__XE_VERSION__', '1.5.1.8'); define('__XE_VERSION__', '1.5.1.7');
define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead. define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.
/** /**

31
modules/document/document.admin.controller.php
View file

@ -426,37 +426,6 @@
$output = $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $name, $type, $is_required, $search, $default, $desc, $eid); $output = $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $name, $type, $is_required, $search, $default, $desc, $eid);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
// update ruleset
$oModuleModel = &getModel('module');
$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
$rulesetFileName = './files/ruleset/insertDocument.'.$moduleInfo->mid.'.xml';
$oDocumentModel = &getModel('document');
$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
if (count($extra_keys)){
$defaultRulsetFile = $oModuleModel->getValidatorFilePath($moduleInfo->module, 'insertDocument');
$parser = new XmlParser();
$xml = $parser->loadXmlFile($defaultRulsetFile);
$generator = new XmlGenerator();
foreach($extra_keys as $idx => $extra_item){
if ($extra_item->is_required == 'Y'){
unset($node);
$node->node_name = 'field';
$node->attrs->name = 'extra_vars'.$idx;
$node->attrs->required = 'true';
$xml->ruleset->fields->field[] = $node;
}
}
$buff = $generator->obj2xml($xml);
FileHandler::writeFile($rulesetFileName, $buff);
}else{
FileHandler::removeFile($rulesetFileName);
}
$this->setMessage('success_registed'); $this->setMessage('success_registed');
if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $args->document_srl); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $args->document_srl);

2
modules/widget/tpl/js/widget.js
View file

@ -63,7 +63,7 @@ function doStartPageModify(zoneID, module_srl) {
function removeAllWidget() { function removeAllWidget() {
if(!confirm(confirm_delete_msg)) return; if(!confirm(confirm_delete_msg)) return;
restoreWidgetButtons(); restoreWidgetButtons();
jQuery(zonePageObj).html(''); xInnerHtml(zonePageObj,'');
} }
/** /**

4
modules/widget/widget.admin.view.php
View file

@ -59,15 +59,13 @@
$oDocument = $oDocumentModel->getDocument($document_srl); $oDocument = $oDocumentModel->getDocument($document_srl);
Context::set('oDocument', $oDocument); Context::set('oDocument', $oDocument);
if (!isset($document_srl)) $document_srl = getNextSequence();
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
$columnList = array('module_srl', 'mid'); $columnList = array('module_srl', 'mid');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
Context::set('module_info', $module_info); Context::set('module_info', $module_info);
// Editors settings of the module by calling getEditor // Editors settings of the module by calling getEditor
$oEditorModel = &getModel('editor'); $oEditorModel = &getModel('editor');
$editor = $oEditorModel->getModuleEditor('document',$module_srl, $document_srl,'document_srl','content'); $editor = $oEditorModel->getModuleEditor('document',$module_srl, $module_srl,'module_srl','content');
Context::set('editor', $editor); Context::set('editor', $editor);
$security = new Security(); $security = new Security();