openrat-cms

commit 95d2f4751fab7532a5047ffb2edcf562c9d11021
parent 3565ac64ee51900e6d5175965d4d6f6cf4612a72
Author: dankert <devnull@localhost>
Date:   Wed, 26 Jan 2011 22:37:25 +0100

Fix: Reihenfolgen-Änderung für Ordnerinhalte.

Diffstat:
action/FolderAction.class.php
 | 
8
++++----
action/FolderAction.ini.php
 | 
12
++++++++----
do.php
 | 
13
+++++++++----

3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/action/FolderAction.class.php b/action/FolderAction.class.php
@@ -367,7 +367,7 @@ class FolderAction extends ObjectAction
 
 
 	// Reihenfolge von Objekten aendern
-	function changesequence()
+	function changesequenceAction()
 	{
 		$ids = $this->folder->getObjectIds();
 		$seq = 0;
@@ -699,7 +699,7 @@ class FolderAction extends ObjectAction
 
 
 	// Reihenfolge von Objekten aendern
-	function reorder()
+	function reorderAction()
 	{
 		$type = $this->getRequestVar('type');
 		
@@ -744,7 +744,7 @@ class FolderAction extends ObjectAction
 	}
 
 
-	function settop()
+	function settopAction()
 	{
 		$o = new Object( $this->getRequestVar('objectid1') );
 		$o->setOrderId( 1 );
@@ -773,7 +773,7 @@ class FolderAction extends ObjectAction
 	}
 
 
-	function setbottom()
+	function setbottomAction()
 	{
 		$ids = $this->folder->getObjectIds();
 		$seq = 0;
diff --git a/action/FolderAction.ini.php b/action/FolderAction.ini.php
@@ -33,10 +33,6 @@ goto=show
 [order]
 menu=show
 
-[reorder]
-menu=show
-goto=order
-
 ; Die Aktionen "rights", "aclform", "addacl" und "delacl" sind
 ; f�r Seiten,Ordner,Links und Dateien identisch.
 [rights]
@@ -99,14 +95,22 @@ goto=createlink
 [createnew]
 goto=create
 
+[reorder]
+menu=show
+goto=order
+write=get
+
 [changesequence]
 goto=order
+write=get
 
 [settop]
 goto=order
+write=get
 
 [setbottom]
 goto=order
+write=get
 
 [menu]
 ;pub=pub
diff --git a/do.php b/do.php
@@ -453,13 +453,17 @@ foreach( $views as $view=>$viewConfig )
 	if	( isset($do->actionConfig[$do->subActionName]['alias']) )
 	{
 		$subaction = $do->actionConfig[$do->subActionName]['alias'];
-	//    $do->subActionName = $subaction;
 	}
-
+	// GOTO-Methode aufrufen.
+	elseif	( isset($do->actionConfig[$do->subActionName]['goto']) )
+	{
+		$subaction = $do->actionConfig[$do->subActionName]['goto'];
+		$do->subActionName = $subaction;
+	}
+	
 	
 	Logger::debug("Executing $actionClassName::$subaction");
 
-	// Alias-Methode aufrufen.
 	if	( isset($do->actionConfig[$do->subActionName]['write']) )
 	{
 		$subactionView = $subaction.'View';
@@ -475,7 +479,8 @@ foreach( $views as $view=>$viewConfig )
 	
 
 	// Aufruf der n�chsten Subaction (falls vorhanden)
-	if	( isset($do->actionConfig[$do->subActionName]['goto']) )
+	
+	if	( false && isset($do->actionConfig[$do->subActionName]['goto']) )
 	{
 		/* Achtung: Redirect fuehrt zu Problemen beim Login sowie der Anzeige von Notices */
 		if	( $conf['interface']['redirect'] )