From 35a365af517e51216ee185b5b93ae14a0f8af483 Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Wed, 15 Feb 2012 09:55:42 +0000
Subject: [PATCH] version update

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10123 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 config/config.inc.php                         |  2 +-
 .../document/document.admin.controller.php    | 31 +++++++++++++++++++
 modules/widget/tpl/js/widget.js               |  2 +-
 modules/widget/widget.admin.view.php          |  4 ++-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/config/config.inc.php b/config/config.inc.php
index 0e0dfd27a..5c806db61 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -13,7 +13,7 @@
      * @brief display XE's full version
      * Even The file should be revised when releasing altough no change is made
      **/
-	define('__XE_VERSION__', '1.5.1.7');
+	define('__XE_VERSION__', '1.5.1.8');
     define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.
 
     /**
diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index f9d6b1763..03924fb14 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -426,6 +426,37 @@
             $output = $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $name, $type, $is_required, $search, $default, $desc, $eid);
             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');
 			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);
diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index 1336760b5..9212eba69 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -63,7 +63,7 @@ function doStartPageModify(zoneID, module_srl) {
 function removeAllWidget() {
     if(!confirm(confirm_delete_msg)) return;
 	restoreWidgetButtons();
-	xInnerHtml(zonePageObj,'');
+	jQuery(zonePageObj).html('');
 }
 
 /**
diff --git a/modules/widget/widget.admin.view.php b/modules/widget/widget.admin.view.php
index 9091db130..8c2f5eb44 100644
--- a/modules/widget/widget.admin.view.php
+++ b/modules/widget/widget.admin.view.php
@@ -59,13 +59,15 @@
             $oDocument = $oDocumentModel->getDocument($document_srl);
             Context::set('oDocument', $oDocument);
 
+			if (!isset($document_srl)) $document_srl = getNextSequence();
+
             $oModuleModel = &getModel('module');
 			$columnList = array('module_srl', 'mid');
             $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
             Context::set('module_info', $module_info);
             // Editors settings of the module by calling getEditor
             $oEditorModel = &getModel('editor');
-            $editor = $oEditorModel->getModuleEditor('document',$module_srl, $module_srl,'module_srl','content');
+            $editor = $oEditorModel->getModuleEditor('document',$module_srl, $document_srl,'document_srl','content');
             Context::set('editor', $editor);
 
 			$security = new Security();