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

issue 160 bug fix in extra vars

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9202 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-09-19 10:17:53 +00:00
parent 5a642be9c1
commit b2b1930c6e
8 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/document/conf/module.xml
View file

@ -52,7 +52,7 @@
<action name="procDocumentAdminRestoreTrash" type="controller" standalone="true" /> <action name="procDocumentAdminRestoreTrash" type="controller" standalone="true" />
<action name="procDocumentAdminMoveExtraVar" type="controller" standalone="true" /> <action name="procDocumentAdminMoveExtraVar" type="controller" standalone="true" />
<action name="procDocumentAdminInsertExtraVar" type="controller" standalone="true" /> <action name="procDocumentAdminInsertExtraVar" type="controller" standalone="true" ruleset="insertExtraVar" />
<action name="procDocumentAdminDeleteExtraVar" type="controller" standalone="true" /> <action name="procDocumentAdminDeleteExtraVar" type="controller" standalone="true" />
<action name="procDocumentAdminDeleteChecked" type="controller" standalone="true" /> <action name="procDocumentAdminDeleteChecked" type="controller" standalone="true" />
<action name="procDocumentAdminInsertConfig" type="controller" standalone="true" /> <action name="procDocumentAdminInsertConfig" type="controller" standalone="true" />

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

@ -410,6 +410,11 @@
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$this->setMessage('success_registed'); $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);
$this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**

4
modules/document/queries/insertDocumentExtraKey.xml
View file

@ -9,8 +9,8 @@
<column name="var_type" var="var_type" notnull="notnull" /> <column name="var_type" var="var_type" notnull="notnull" />
<column name="var_is_required" var="var_is_required" default="N" notnull="notnull" /> <column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
<column name="var_search" var="var_search" default="N" notnull="notnull" /> <column name="var_search" var="var_search" default="N" notnull="notnull" />
<column name="var_default" var="var_default" notnull="notnull" /> <column name="var_default" var="var_default" />
<column name="var_desc" var="var_desc" notnull="notnull" /> <column name="var_desc" var="var_desc" />
<column name="eid" var="eid" notnull="notnull" /> <column name="eid" var="eid" notnull="notnull" />
</columns> </columns>
</query> </query>

4
modules/document/queries/updateDocumentExtraKey.xml
View file

@ -7,8 +7,8 @@
<column name="var_type" var="var_type" notnull="notnull" /> <column name="var_type" var="var_type" notnull="notnull" />
<column name="var_is_required" var="var_is_required" default="N" notnull="notnull" /> <column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
<column name="var_search" var="var_search" default="N" notnull="notnull" /> <column name="var_search" var="var_search" default="N" notnull="notnull" />
<column name="var_default" var="var_default" default="" /> <column name="var_default" var="var_default" />
<column name="var_desc" var="var_desc" default="" /> <column name="var_desc" var="var_desc" />
<column name="eid" var="eid" notnull="notnull" /> <column name="eid" var="eid" notnull="notnull" />
</columns> </columns>
<conditions> <conditions>

2
modules/document/queries/updateDocumentExtraVar.xml
View file

@ -3,7 +3,7 @@
<table name="document_extra_vars" /> <table name="document_extra_vars" />
</tables> </tables>
<columns> <columns>
<column name="value" var="value" notnull="notnull" /> <column name="value" var="value" />
<column name="lang_code" var="lang_code" /> <column name="lang_code" var="lang_code" />
<column name="eid" var="eid" /> <column name="eid" var="eid" />
</columns> </columns>

11
modules/document/tpl/extra_keys.html
View file

@ -6,16 +6,21 @@
<!--@if($selected_var_idx && $extra_keys[$selected_var_idx])--> <!--@if($selected_var_idx && $extra_keys[$selected_var_idx])-->
{@ $selected_var = $extra_keys[$selected_var_idx] } {@ $selected_var = $extra_keys[$selected_var_idx] }
<!--@end--> <!--@end-->
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<!--@if($type == 'insertExtraForm' || $selected_var_idx)--> <!--@if($type == 'insertExtraForm' || $selected_var_idx)-->
<form action="./" method="post" onsubmit="return procFilter(this, insert_extra_var)"> <form ruleset="insertExtraVar" action="./" method="post">
<input type="hidden" name="act" value="procDocumentAdminInsertExtraVar" />
<input type="hidden" name="module_srl" value="{$module_srl}" /> <input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="var_idx" value="{$selected_var_idx}" /> <input type="hidden" name="var_idx" value="{$selected_var_idx}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', $module, 'act', $act, 'module_srl', $module_srl)}" />
<h4 class="xeAdmin">{$lang->extra_vars} {$selected_var_idx}</h4> <h4 class="xeAdmin">{$lang->extra_vars} {$selected_var_idx}</h4>
<table cellspacing="0" class="crossTable "> <table cellspacing="0" class="crossTable ">
<tr> <tr>
<th><div>thisthis{$lang->eid}</div></th> <th><div>{$lang->eid}</div></th>
<td class="wide"> <td class="wide">
<input type="text" name="eid" value="{$selected_var->eid}" class="inputTypeText w200" id="eid" /><p>{$lang->about_extra_vars_eid_value}</p> <input type="text" name="eid" value="{$selected_var->eid}" class="inputTypeText w200" id="eid" /><p>{$lang->about_extra_vars_eid_value}</p>
</td> </td>
@ -119,4 +124,4 @@
<form id="fo_delete" name="fo_delete" method="post" action="./"> <form id="fo_delete" name="fo_delete" method="post" action="./">
<input type="hidden" name="module_srl" value="" /> <input type="hidden" name="module_srl" value="" />
<input type="hidden" name="var_idx" value="" /> <input type="hidden" name="var_idx" value="" />
<form> </form>

9
modules/module/tpl/js/multilingual.js
View file

@ -44,3 +44,12 @@ $('#langList')
}) })
}); });
function doInsertLangCode(langCode, target)
{
if(window.opener && target) {
var obj = window.opener.get_by_id(target);
if(obj) obj.value = '$user_lang->'+langCode;
}
window.close();
}

2
modules/module/tpl/module_langcode.html
View file

@ -11,7 +11,7 @@
<ul id="langList"> <ul id="langList">
<li loop="$lang_code_list=>$key,$value"> <li loop="$lang_code_list=>$key,$value">
{@$langName = $value->name} {@$langName = $value->name}
<strong>{$value->value}</strong> <button type="button" class="side text _edit">{$lang->cmd_edit}</button> <strong>{$value->value}</strong> <span class="side"><button type="button" class="text" cond="$module != 'admin'" onclick="doInsertLangCode('{$value->name}', '{$target}')">{$lang->cmd_apply}</button><button type="button" class="text _edit">{$lang->cmd_edit}</button></span>
<form action="./" method="post" id="langForm_{$langName}" > <form action="./" method="post" id="langForm_{$langName}" >
<input type="hidden" name="act" value="procModuleAdminInsertLang" /> <input type="hidden" name="act" value="procModuleAdminInsertLang" />
<input type="hidden" name="lang_name" value="{$langName}" /> <input type="hidden" name="lang_name" value="{$langName}" />