In-Portal Issue Tracker

Index: kernel/languages/phrases_cache.php
===================================================================
--- kernel/languages/phrases_cache.php	(revision 14318)
+++ kernel/languages/phrases_cache.php	(working copy)
@@ -127,6 +127,7 @@
 					'm_opener' => 'd',
 					'phrases_label' => '#LABEL#',
 					'phrases_event' => 'OnPreparePhrase',
+					'next_template' => urlencode('external:' . $_SERVER['REQUEST_URI']),
 					'pass' => 'm,phrases'
 				);
 
Index: units/phrases/phrases_event_handler.php
===================================================================
--- units/phrases/phrases_event_handler.php	(revision 14318)
+++ units/phrases/phrases_event_handler.php	(working copy)
@@ -48,7 +48,7 @@
 		 */
 		function CheckPermission(&$event)
 		{
-			if (!$this->Application->isAdmin && $this->Application->isDebugMode() && constOn('DBG_PHRASES')) {
+			if (!$this->Application->isAdmin && $this->Application->isDebugMode(false) && constOn('DBG_PHRASES')) {
 				$allow_events = Array ('OnCreate', 'OnUpdate');
 
 				if (in_array($event->Name, $allow_events)) {
@@ -171,6 +171,13 @@
 				if ($this->Application->GetVar('m_lang') != $this->Application->GetVar('lang_id')) {
 					$object->SwitchToLive();
 				}
+
+				$next_template = $this->Application->GetVar('next_template');
+
+				if ($next_template) {
+					$event->redirect = $next_template;
+					$event->SetRedirectParam('opener', 's');
+				}
 			}
 
 			parent::OnCreate($event);

Index: phrases_edit.tpl
===================================================================
--- phrases_edit.tpl	(revision 14318)
+++ phrases_edit.tpl	(working copy)
@@ -53,12 +53,12 @@
 					<table class="form-data fullwidth">
 						<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="lu_fld_primary_translation"/>
 						<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="lu_fld_phrase" style="width: 300px;"/>
-						<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Translation" title="lu_fld_translation" style="width: 300px;"/>
+						<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="Translation" title="lu_fld_translation" cols="52" rows="6" style="width: 300px; height: 100px;"/>
 						<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="lu_fld_module" is_last="1"/>
 
 						<inp2:m_RenderElement design="inp_edit_buttons" width="150">
 							<input type="hidden" id="phrases_label" name="phrases_label" value="<inp2:m_get var="phrases_label"/>" />
-							<input type="hidden" name="<inp2:phrases_InputName field="LanguageId"/>" value="<inp2:phrases_Field name="LanguageId"/>" />
+							<input type="hidden" id="next_template" name="next_template" value="<inp2:m_get var="next_template"/>" />
 							<input type="hidden" name="<inp2:phrases_InputName field="PhraseType"/>" value="0" />
 							<input class="button" type="submit" name="events[phrases][<inp2:phrases_SaveEvent/>]" value="<inp2:m_Phrase label='lu_btn_Create' no_editing='1'/>"/>
 						</inp2:m_RenderElement>

Index: units/phrases/phrases_event_handler.php
===================================================================
--- units/phrases/phrases_event_handler.php	(revision 14338)
+++ units/phrases/phrases_event_handler.php	(working copy)
@@ -90,6 +90,12 @@
 			if ($phrase_id) {
 				$event->SetRedirectParam($event->getPrefixSpecial(true) . '_id', $phrase_id);
 				$event->SetRedirectParam('pass', 'm,' . $event->getPrefixSpecial());
+
+				$next_template = $this->Application->GetVar('next_template');
+
+				if ($next_template) {
+					$event->SetRedirectParam('next_template', $next_template);
+				}
 			}
 			else {
 				$event->CallSubEvent('OnNew');
@@ -172,18 +178,42 @@
 					$object->SwitchToLive();
 				}
 
-				$next_template = $this->Application->GetVar('next_template');
-
-				if ($next_template) {
-					$event->redirect = $next_template;
-					$event->SetRedirectParam('opener', 's');
-				}
+				$this->returnToOriginalTemplate($event);
 			}
 
 			parent::OnCreate($event);
 		}
 
 		/**
+		 * Redirects to original template after phrase is being update
+		 *
+		 * @param kEvent $event
+		 */
+		function OnUpdate(&$event)
+		{
+			if ( $this->Application->GetVar($event->Prefix . '_label') ) {
+				$this->returnToOriginalTemplate($event);
+			}
+
+			parent::OnUpdate($event);
+		}
+
+		/**
+		 * Returns to original template after phrase adding/editing
+		 *
+		 * @param kEvent $event
+		 */
+		function returnToOriginalTemplate(&$event)
+		{
+			$next_template = $this->Application->GetVar('next_template');
+
+			if ($next_template) {
+				$event->redirect = $next_template;
+				$event->SetRedirectParam('opener', 's');
+			}
+		}
+
+		/**
 		 * Set last change info, when phrase is created
 		 *
 		 * @param kEvent $event

Index: phrases_edit.tpl
===================================================================
--- phrases_edit.tpl	(revision 14337)
+++ phrases_edit.tpl	(working copy)
@@ -53,7 +53,7 @@
 					<table class="form-data fullwidth">
 						<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="lu_fld_primary_translation"/>
 						<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="lu_fld_phrase" style="width: 300px;"/>
-						<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="Translation" title="lu_fld_translation" cols="52" rows="6" style="width: 300px; height: 100px;"/>
+						<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="Translation" title="lu_fld_translation" cols="52" rows="6" format="no_default" style="width: 300px; height: 100px;"/>
 						<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="lu_fld_module" is_last="1"/>
 
 						<inp2:m_RenderElement design="inp_edit_buttons" width="150">
Index: platform/elements/forms.elm.tpl
===================================================================
--- platform/elements/forms.elm.tpl	(revision 14318)
+++ platform/elements/forms.elm.tpl	(working copy)
@@ -312,14 +312,14 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_textarea" style="" no_editing="1" is_last="0">
+<inp2:m_DefineElement name="inp_edit_textarea" style="" no_editing="1" format="" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
 			<inp2:m_if check="{$prefix}_HasError" field="$field">
 				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
 			</inp2:m_if>
-			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" style="<inp2:m_param name="style"/>"><inp2:{$prefix}_Field field="$field"/></textarea>
+			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" style="<inp2:m_param name="style"/>"><inp2:{$prefix}_Field field="$field" format="$format"/></textarea>
 		</td>
 	</tr>
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>