openrat-cms

commit 5c68640fa95251f6688a77a2735e7c7804f7a938
parent 4d75bc2d7550d2a4b4b8ca08bcf0d72e98a385e5
Author: dankert <devnull@localhost>
Date:   Mon, 29 Oct 2007 23:16:19 +0100

Korrektur Auswahl-Eigenschaften f?r Kopie-Element

Diffstat:
actionClasses/ElementAction.class.php
 | 
20
++++++++++----------
objectClasses/Element.class.php
 | 
11
+++++++----

2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/actionClasses/ElementAction.class.php b/actionClasses/ElementAction.class.php
@@ -137,12 +137,14 @@ class ElementAction extends Action
 	}
 	
 	
+	/**
+	 * Auswahlmaske für weitere Einstellungen zum Template-Element.
+	 *
+	 */
 	function properties()
 	{
 		global $conf;
 		
-//		Html::debug($this->element);
-
 		// Abhaengig vom aktuellen Element-Typ die Eigenschaften anzeigen
 		$properties = $this->element->getRelatedProperties();
 
@@ -347,7 +349,8 @@ class ElementAction extends Action
 				
 				case 'prefix':
 					$t = new Template( $this->element->templateid );
-					
+
+					$elements = array();
 					foreach( $t->getElements() as $element )
 					{
 						if	( $element->type == 'link' )
@@ -357,7 +360,7 @@ class ElementAction extends Action
 					
 					$this->setTemplateVar('linkelements',$elements );
 
-					@list($linkElementName,$targetElementName) = explode('%',$this->element->name);
+					list($linkElementName,$targetElementName) = explode('%',$this->element->name.'%');
 					$this->setTemplateVar('linkelement',$linkElementName );
 					
 					break;
@@ -382,7 +385,7 @@ class ElementAction extends Action
 					
 					$this->setTemplateVar('names',$names );
 
-					list($linkElementName,$targetElementName) = explode('%',$this->element->name);
+					list($linkElementName,$targetElementName) = explode('%',$this->element->name.'%');
 					$this->setTemplateVar('name',$targetElementName );
 					break;
 
@@ -582,14 +585,11 @@ class ElementAction extends Action
 		
 		if	( $this->hasRequestVar('parameters'))
 			$this->element->code = $this->getRequestVar('parameters');
-			
-//		if	( $this->hasRequestVar('elementid'))
-//			$this->element->code = $this->getRequestVar('elementid');
 		
-		$this->addNotice('element',$this->element->name,'SAVED');
+		Html::debug($this->element);
 		$this->element->save();
+		$this->addNotice('element',$this->element->name,'SAVED');
 		
-//		Html::debug($this->element);
 	}
 }
 
diff --git a/objectClasses/Element.class.php b/objectClasses/Element.class.php
@@ -20,6 +20,9 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
+// Revision 1.20  2007-10-29 22:16:19  dankert
+// Korrektur Auswahl-Eigenschaften f?r Kopie-Element
+//
 // Revision 1.19  2007-05-22 20:12:28  dankert
 // Elementtyp "list" hei?t intern nun "insert".
 //
@@ -232,6 +235,9 @@ class Element
 
 	function setDatabaseRow( $prop )
 	{
+		if	( count($prop) <= 0 )
+			return;
+
 		$this->elementid      = $prop['id'        ];
 		$this->templateid     = $prop['templateid'];
 		$this->name           = $prop['name'      ];
@@ -347,10 +353,7 @@ class Element
 	 */
 	function setPrefix( $prefix )
 	{
-		@list( $oldprefix,$name ) = explode('%',$this->name);
-		
-		if	( is_null($name) )
-			$name = $oldprefix;
+		list( $oldprefix,$name ) = explode('%',$this->name.'%');
 		
 		$this->name = $prefix.'%'.$name;
 	}