openrat-cms

commit f1f29bce6d61ba21e41f82bad5e02fa1173701af
parent 54dcc6aa939f58e0ad92b26c98752106defb5ea9
Author: Jan Dankert <devnull@localhost>
Date:   Sat, 22 Sep 2012 05:11:03 +0200

Fix: Austauschen der Templates, Speichern von Text-Inhalt.

Diffstat:
action/PageAction.class.php
 | 
19
+++----------------
action/PageAction.ini.php
 | 
2
+-
action/PageelementAction.ini.php
 | 
1
-
themes/default/templates/page/changetemplate.tpl.src.xml
 | 
4
++--
themes/default/templates/page/changetemplateselectelements.tpl.src.xml
 | 
1
+

5 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/action/PageAction.class.php b/action/PageAction.class.php
@@ -399,19 +399,6 @@ class PageAction extends ObjectAction
 	
 	 
 	}
-
-	
-	
-	/**
-	 * Die Vorlage der Seite austauschen
-	 *
-	 * Die Vorlage wird ausgetauscht, die Inhalte werden gemaess der Benutzereingaben kopiert
-	 */
-	public function changetemplatePost()
-	{
-		Session::set('newtemplateid',intval($this->getRequestVar('templateid')) );
-		$this->nextView('changetemplateselectelements');
-	}
 	
 	
 
@@ -424,11 +411,11 @@ class PageAction extends ObjectAction
 	 */
 	public function changetemplateselectelementsView()
 	{
-		$newTemplateId = intval( Session::get('newtemplateid') );
+		$newTemplateId = $this->getRequestVar( 'newtemplateid' );
 
 		if   ( $newTemplateId != 0  )
 		{
-			$this->setTemplateVar('newTemplateId',$newTemplateId );
+			$this->setTemplateVar('newtemplateid',$newTemplateId );
 
 			$oldElements = array();
 			$oldTemplate = new Template( $this->page->templateid );
@@ -479,7 +466,7 @@ class PageAction extends ObjectAction
 	 */
 	public function changetemplateselectelementsPost()
 	{
-		$newTemplateId = intval( Session::get('newtemplateid') );
+		$newTemplateId = $this->getRequestVar('newtemplateid');
 		$replaceElementMap = Array();
 		
 		$oldTemplate = new Template( $this->page->templateid );
diff --git a/action/PageAction.ini.php b/action/PageAction.ini.php
@@ -36,7 +36,7 @@ target=changetemplateselectelements
 
 [changetemplateselectelements]
 menu=prop
-target=replacetemplate
+target=changetemplateselectelements
 
 [replacetemplate]
 goto=prop
diff --git a/action/PageelementAction.ini.php b/action/PageelementAction.ini.php
@@ -35,7 +35,6 @@ goto=archive
 
 [edit]
 menu=edit
-target=save
 editable=true
 
 [prop]
diff --git a/themes/default/templates/page/changetemplate.tpl.src.xml b/themes/default/templates/page/changetemplate.tpl.src.xml
@@ -1,6 +1,6 @@
 <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
-	<form>
+	<form method="get" subaction="changetemplateselectelements">
 		<part class="line">
 			<part class="label">
 				<text text="page_template_old"></text>
@@ -18,7 +18,7 @@
 				<text text="page_template_new"></text>
 			</part>
 			<part class="input">
-				<selectbox name="templateid" list="templates" class="focus"></selectbox>
+				<selectbox name="newtemplateid" list="templates" class="focus"></selectbox>
 			</part>
 		</part>
 
diff --git a/themes/default/templates/page/changetemplateselectelements.tpl.src.xml b/themes/default/templates/page/changetemplateselectelements.tpl.src.xml
@@ -1,6 +1,7 @@
 <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
 	<form>
+		<hidden name="newtemplateid" />
 		<list list="elements" extract="true">
 			<part class="line">
 				<part class="label">