[pLog-svn] r2428 - in plog/branches/plog-1.0.2: class/controller templates/admin

[jondaley at devel.plogworld.net]

Author: jondaley
Date: 2005-08-30 02:12:52 +0000 (Tue, 30 Aug 2005)
New Revision: 2428

Modified:
   plog/branches/plog-1.0.2/class/controller/controller.class.php
   plog/branches/plog-1.0.2/templates/admin/dashboard.template
Log:
Fixed the delete array problem Mark and I have been having.

Modified: plog/branches/plog-1.0.2/class/controller/controller.class.php
===================================================================
--- plog/branches/plog-1.0.2/class/controller/controller.class.php	2005-08-29 16:50:27 UTC (rev 2427)
+++ plog/branches/plog-1.0.2/class/controller/controller.class.php	2005-08-30 02:12:52 UTC (rev 2428)
@@ -260,7 +260,6 @@
         {
             // get the name of the action
             $request = new Request( $httpRequest );
-            $actionName = $request->getValue($this->_actionParam );
 
             $i = 0;
             $performed = false;
@@ -269,7 +268,10 @@
                 // get the value of this varilable, every loop
                 global $_plogController_forwardAction;
 				global $_plogController_previousAction;
-				
+
+                    // jondaley: 08/29/2005, what are these here for??
+                    // perhaps the global statements should be moved
+                    // inside the elseif loop below?
                 $_plogController_forwardAction;
 				$_plogController_previousAction;
 
@@ -277,11 +279,13 @@
                     // if this is the first iteration, then we have to take this path...
                     // since we will use the http request to determine which action to
                     // use next
+                    $actionName = $request->getValue($this->_actionParam );
                     $actionClass = $this->_getActionClassName($request->getValue($this->_actionParam));
                 }
                 elseif (!empty($_plogController_forwardAction)) {
                     // if we're forwarding the current execution flow to another action, then
                     // we'll go this way
+                    $actionName = $_plogController_forwardAction;
                     $actionClass = $this->_getActionClassName($_plogController_forwardAction);
                     $httpRequest = HttpVars::getRequest();
                     $_plogController_forwardAction = null;

Modified: plog/branches/plog-1.0.2/templates/admin/dashboard.template
===================================================================
--- plog/branches/plog-1.0.2/templates/admin/dashboard.template	2005-08-29 16:50:27 UTC (rev 2427)
+++ plog/branches/plog-1.0.2/templates/admin/dashboard.template	2005-08-30 02:12:52 UTC (rev 2428)
@@ -34,7 +34,7 @@
                             <td>
                                 <div class="list_action_button">
                                 <a href="?op=blogSelect&amp;blogId={$blog->getId()}&amp;action=editPost&amp;postId={$post->getId()}"><img src="imgs/admin/icon_edit-16.png" alt="{$locale->tr("edit")}" /></a>
-                                <a href="?op=blogSelect&amp;blogId={$blog->getId()}&amp;action=deletePost&amp;postIds[]={$post->getId()}"><img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" /></a>
+                                <a href="?op=blogSelect&amp;blogId={$blog->getId()}&amp;action=deletePost&amp;postId={$post->getId()}"><img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" /></a>
                                 </div>
                             </td>
                         </tr>