From 4e1b64680d349544f45174e049de20cf480e84d7 Mon Sep 17 00:00:00 2001
From: chschy <chschy@gmail.com>
Date: Fri, 13 Jul 2012 04:33:49 +0000
Subject: [PATCH] r1498 use existing value

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10885 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/module/lang/lang.xml                 | 10 ++++++++
 modules/module/module.admin.controller.php   | 24 ++++++++++++--------
 modules/module/ruleset/insertModuleSetup.xml |  1 -
 modules/module/tpl/include.module_setup.html | 21 +++++++++++------
 modules/module/tpl/module_setup.html         |  5 +++-
 5 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/modules/module/lang/lang.xml b/modules/module/lang/lang.xml
index 756855c35..b8c78bb67 100644
--- a/modules/module/lang/lang.xml
+++ b/modules/module/lang/lang.xml
@@ -1043,4 +1043,14 @@ Le module [Administration des Modules] montera tous les modules installés et vo
 		<value xml:lang="en"><![CDATA[Add]]></value>
 		<value xml:lang="zh-TW"><![CDATA[新增]]></value>
 	</item>
+	<item name="keep_existing_value">
+		<value xml:lang="ko"><![CDATA[기존 값 유지]]></value>
+		<value xml:lang="en"><![CDATA[Keep existing value]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Keep existing value]]></value>
+	</item>
+	<item name="about_maintain_existing">
+		<value xml:lang="ko"><![CDATA[공란일 경우 기존 값을 따릅니다.]]></value>
+		<value xml:lang="en"><![CDATA[If content empty, maintain existing value.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[If content empty, maintain existing value.]]></value>
+	</item>
 </lang>
diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php
index 689ad0254..cf1e37b7b 100644
--- a/modules/module/module.admin.controller.php
+++ b/modules/module/module.admin.controller.php
@@ -362,17 +362,23 @@
             $oModuleModel = &getModel('module');
             $oModuleController= &getController('module');
 			$columnList = array('module_srl', 'module', 'menu_srl', 'site_srl', 'mid', 'browser_title', 'is_default', 'content', 'mcontent', 'open_rss', 'regdate');
+			$updateList = array('module_category_srl','layout_srl','skin','mlayout_srl','mskin','description','header_text','footer_text'); //use_mobile
+			foreach($updateList as $key=>$val)
+			{
+				if(!$vars->{$val} && $vars->{$val} !== 0)
+				{
+					unset($updateList[$key]);
+					$columnList[] = $val;
+				}
+			}
+
             foreach($module_srls as $module_srl) {
                 $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-                $module_info->module_category_srl = $vars->module_category_srl;
-                $module_info->layout_srl = $vars->layout_srl;
-                $module_info->skin = $vars->skin;
-                $module_info->use_mobile = $vars->use_mobile;
-                $module_info->mlayout_srl = $vars->mlayout_srl;
-                $module_info->mskin = $vars->mskin;
-                $module_info->description = $vars->description;
-                $module_info->header_text = $vars->header_text;
-                $module_info->footer_text = $vars->footer_text;
+
+				foreach($updateList as $val)
+				{
+					$module_info->{$val} = $vars->{$val};
+				}
                 $output = $oModuleController->updateModule($module_info);
             }
 
diff --git a/modules/module/ruleset/insertModuleSetup.xml b/modules/module/ruleset/insertModuleSetup.xml
index f5e1ba2cd..d59771443 100644
--- a/modules/module/ruleset/insertModuleSetup.xml
+++ b/modules/module/ruleset/insertModuleSetup.xml
@@ -6,6 +6,5 @@
 		<field name="module_srls" required="true" />
 		<field name="module_category_srl" rule="number" />
 		<field name="layout_srl" rule="number" />
-		<field name="skin" required="true" />
     </fields>
 </ruleset>
diff --git a/modules/module/tpl/include.module_setup.html b/modules/module/tpl/include.module_setup.html
index 7980077c8..79169896d 100644
--- a/modules/module/tpl/include.module_setup.html
+++ b/modules/module/tpl/include.module_setup.html
@@ -10,6 +10,7 @@
 				<p class="q"><label for="module_category_srl">{$lang->module_category}</label></p>
 				<p class="a">
 					<select name="module_category_srl" id="module_category_srl">
+						<option value="" selected="selected">{$lang->keep_existing_value}</option>
 						<option value="0">{$lang->notuse}</option>
 						<!--@foreach($module_category as $key => $val)-->
 						<option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
@@ -22,6 +23,7 @@
 				<p class="q"><label for="layout_srl">{$lang->layout}</label></p>
 				<p class="a">
 					<select name="layout_srl" id="layout_srl">
+						<option value="" selected="selected">{$lang->keep_existing_value}</option>
 						<option value="0">{$lang->notuse}</option>
 						<!--@foreach($layout_list as $key => $val)-->
 						<option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
@@ -34,35 +36,40 @@
 				<p class="q"><label for="skin">{$lang->skin}</label></p>
 				<p class="a">
 					<select name="skin" id="skin">
+						<option value="" selected="selected">{$lang->keep_existing_value}</option>
 						<!--@foreach($skin_list as $key=>$val)-->
-						<option value="{$key}" <!--@if($module_info->skin==$key ||(!$module_info->skin && $key=='xe_board'))-->selected="selected"<!--@end-->>{$val->title}</option>
+						<option value="{$key}" <!--@if($module_info->skin==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
 						<!--@end-->
 					</select>
 				</p>
 				<p class="desc">{$lang->about_skin}</p>
 			</li>
-		<li>
+		<!--li>
 			<p class="q"><label for="layout_srl">{$lang->mobile_view}</label></p>
-			<p class="a"><input type="checkbox" name="use_mobile" id="use_mobile" value="Y" checked="checked"|cond="$module_info->use_mobile == 'Y'" /> <label for="use_mobile">{$lang->about_mobile_view}</label></p>
-		</li>
+			<p class="a">
+				<input type="checkbox" name="use_mobile" id="use_mobile" value="Y" checked="checked"|cond="$module_info->use_mobile == 'Y'" /> <label for="use_mobile">{$lang->mobile_view}</label>
+				<input type="checkbox" name="keep_mobile_value" id="keep_mobile_value" value="Y" checked="checked"|cond="$module_info->use_mobile == 'Y'" /> <label for="use_mobile">{$lang->mobile_view}</label>
+
+			</p>
+		</li-->
 		<li>
 			<p class="q"><label for="mlayout_srl">{$lang->mobile_layout}</label></p>
 			<p class="a">
 				<select name="mlayout_srl" id="layout_srl">
+					<option value="" selected="selected">{$lang->keep_existing_value}</option>
 					<option value="0">{$lang->notuse}</option>
 					<option loop="$mlayout_list => $key, $val" value="{$val->layout_srl}" selected="selected"|cond="$module_info->mlayout_srl== $val->layout_srl">{$val->title} ({$val->layout})</option>
 				</select>
 			</p>
-			<p class="desc">{$lang->about_layout}</p>
 		</li>
 		<li>
 			<p class="q"><label for="mskin">{$lang->mobile_skin}</label></p>
 			<p class="a">
 				<select name="mskin" id="mskin">
-					<option loop="$mskin_list=> $key, $val" value="{$key}" selected="selected"|cond="$module_info->mskin== $key || (!$module_info->skin && $key=='xe_board')">{$val->title}</option>
+					<option value="" selected="selected">{$lang->keep_existing_value}</option>
+					<option loop="$mskin_list=> $key, $val" value="{$key}" selected="selected"|cond="$module_info->mskin== $key">{$val->title}</option>
 				</select>
 			</p>
-			<p class="desc">{$lang->about_skin}</p>
 		</li>
 			<li>
 				<p class="q"><label for="description">{$lang->description}</label></p>
diff --git a/modules/module/tpl/module_setup.html b/modules/module/tpl/module_setup.html
index f9283be18..81c506584 100644
--- a/modules/module/tpl/module_setup.html
+++ b/modules/module/tpl/module_setup.html
@@ -12,6 +12,7 @@
 			<p class="q"><label for="module_category_srl">{$lang->module_category}</label></p>
 			<p class="a">
 				<select name="module_category_srl" id="module_category_srl">
+					<option value="" selected="selected">{$lang->keep_existing_value}</option>
 					<option value="0">{$lang->notuse}</option>
 					<!--@foreach($module_category as $key => $val)-->
 					<option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
@@ -24,6 +25,7 @@
 			<p class="q"><label for="layout_srl">{$lang->layout}</label></p>
 			<p class="a">
 				<select name="layout_srl" id="layout_srl">
+					<option value="" selected="selected">{$lang->keep_existing_value}</option>
 					<option value="0">{$lang->notuse}</option>
 					<!--@foreach($layout_list as $key => $val)-->
 					<option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
@@ -36,8 +38,9 @@
 			<p class="q"><label for="skin">{$lang->skin}</label></p>
 			<p class="a">
 				<select name="skin" id="skin">
+					<option value="" selected="selected">{$lang->keep_existing_value}</option>
 					<!--@foreach($skin_list as $key=>$val)-->
-					<option value="{$key}" <!--@if($module_info->skin==$key ||(!$module_info->skin && $key=='xe_board'))-->selected="selected"<!--@end-->>{$val->title}</option>
+					<option value="{$key}" <!--@if($module_info->skin==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
 					<!--@end-->
 				</select>
 			</p>