commit 62b4cc6eafac6b08318ddc8a4348fb65e5725aaf
parent c1a90473a7c7bfe8c529263ed5889900fec661e2
Author: dankert <devnull@localhost>
Date: Fri, 26 Oct 2007 00:52:09 +0200
Korrektur Templatetausch.
Diffstat:
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/actionClasses/PageAction.class.php b/actionClasses/PageAction.class.php
@@ -330,7 +330,7 @@ class PageAction extends ObjectAction
{
$this->setTemplateVar('newTemplateId',$newTemplateId );
- $oldElements = Array();
+ $oldElements = array();
$oldTemplate = new Template( $this->page->templateid );
$newTemplate = new Template( $newTemplateId );
@@ -342,7 +342,9 @@ class PageAction extends ObjectAction
if ( !$e->isWritable() )
continue;
- $oldElements[$elementid] = $e->name.' - '.lang('EL_'.$e->type );
+ $oldElement = array();
+ $oldElement['name'] = $e->name.' - '.lang('EL_'.$e->type );
+ $oldElement['id' ] = $e->elementid;
$newElements = Array();
$newElements[0] = lang('ELEMENT_DELETE_VALUES');
@@ -354,14 +356,13 @@ class PageAction extends ObjectAction
// Nur neue Elemente anbieten, deren Typ identisch ist
if ( $ne->type == $e->type )
- $newElements[$newelementid] = lang('ELEMENT').': '.$e->name.' - '.lang('EL_'.$e->type );
+ $newElements[$newelementid] = lang('ELEMENT').': '.$ne->name.' - '.lang('EL_'.$e->type );
}
- $this->setTemplateVar('newTemplateElementsOf'.$elementid,$newElements );
+ $oldElement['newElementsName'] = 'from'.$e->elementid;
+ $oldElement['newElementsList'] = $newElements;
+ $oldElements[$elementid] = $oldElement;
}
- $this->setTemplateVar('oldTemplateElements',$oldElements );
-
-
- $this->forward('page_replacetemplate');
+ $this->setTemplateVar('elements',$oldElements );
}
else
{
@@ -383,14 +384,15 @@ class PageAction extends ObjectAction
$oldTemplate = new Template( $this->page->templateid );
foreach( $oldTemplate->getElementIds() as $elementid )
- {
$replaceElementMap[$elementid] = $this->getRequestVar('from'.$elementid);
- }
- if ($newTemplateId != 0 )
+ if ( $newTemplateId != 0 )
{
$this->page->replaceTemplate( $newTemplateId,$replaceElementMap );
+ $this->addNotice('page',$this->page->name,'SAVED',OR_NOTICE_OK);
}
+ else
+ $this->addNotice('page',$this->page->name,'NOT_SAVED',OR_NOTICE_WARN);
}
diff --git a/themes/default/templates/page/changetemplateselectelements.tpl.src.php b/themes/default/templates/page/changetemplateselectelements.tpl.src.php
@@ -2,14 +2,12 @@ page
form
hidden name:newTemplateId default:newTemplateId
window
- list list:oldTemplateElements key:oldId value:oldName
+ list list:elements extract:true
row
- cell class:fx
- text var:oldName
- cell class:fx
-RAW
-<?php $listName = 'newTemplateElementsOf'.$oldId; echo Html::selectBox('from'.$oldId,$$listName) ?>
-END
+ cell
+ text var:name
+ cell
+ selectbox name:var:newElementsName list:newElementsList
row
cell class:act colspan:2
button type:ok
\ No newline at end of file