Author: jablko
Date: Sun Sep 20 16:45:44 2009
New Revision: 3452
Log:
Drop unnecessary return statements,
http://www.symfony-project.org/book/1_2/06-Inside-the-Controller-Layer#chapter_06_sub_skipping_to_another_action
Modified:
trunk/apps/qubit/modules/actor/actions/deleteAction.class.php
trunk/apps/qubit/modules/actor/actions/deleteContactInformationAction.class.php
trunk/apps/qubit/modules/actor/actions/deleteNoteAction.class.php
trunk/apps/qubit/modules/actor/actions/deleteOtherNameAction.class.php
trunk/apps/qubit/modules/actor/actions/deletePropertyAction.class.php
trunk/apps/qubit/modules/actor/actions/deleteTermRelationAction.class.php
trunk/apps/qubit/modules/actor/actions/editAction.class.php
trunk/apps/qubit/modules/actor/actions/editContactInformationAction.class.php
trunk/apps/qubit/modules/digitalobject/actions/deleteAction.class.php
trunk/apps/qubit/modules/digitalobject/actions/updateAction.class.php
trunk/apps/qubit/modules/i18n/actions/updateAction.class.php
trunk/apps/qubit/modules/informationobject/actions/deleteAction.class.php
trunk/apps/qubit/modules/informationobject/actions/deleteEventAction.class.php
trunk/apps/qubit/modules/informationobject/actions/deleteNoteAction.class.php
trunk/apps/qubit/modules/informationobject/actions/deletePropertyAction.class.php
trunk/apps/qubit/modules/informationobject/actions/deleteTermRelationAction.class.php
trunk/apps/qubit/modules/map/actions/actions.class.php
trunk/apps/qubit/modules/map/actions/deletePlaceMapRelationAction.class.php
trunk/apps/qubit/modules/map/actions/updatePlaceMapRelationAction.class.php
trunk/apps/qubit/modules/menu/actions/deleteAction.class.php
trunk/apps/qubit/modules/physicalobject/actions/deleteAction.class.php
trunk/apps/qubit/modules/physicalobject/actions/updateAction.class.php
trunk/apps/qubit/modules/place/actions/actions.class.php
trunk/apps/qubit/modules/relation/actions/deleteAction.class.php
trunk/apps/qubit/modules/repository/actions/deleteAction.class.php
trunk/apps/qubit/modules/repository/actions/deleteTermRelationAction.class.php
trunk/apps/qubit/modules/repository/actions/editAction.class.php
trunk/apps/qubit/modules/settings/actions/deleteAction.class.php
trunk/apps/qubit/modules/settings/actions/updateAction.class.php
trunk/apps/qubit/modules/staticpage/actions/deleteAction.class.php
trunk/apps/qubit/modules/staticpage/actions/updateAction.class.php
trunk/apps/qubit/modules/term/actions/deleteAction.class.php
trunk/apps/qubit/modules/term/actions/deleteNoteAction.class.php
trunk/apps/qubit/modules/term/actions/editAction.class.php
trunk/apps/qubit/modules/user/actions/deleteAction.class.php
trunk/apps/qubit/modules/user/actions/passwordUpdateAction.class.php
Modified: trunk/apps/qubit/modules/actor/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/deleteAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/actor/actions/deleteAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -48,7 +48,7 @@
$this->actor->delete();
- return $this->redirect(array('module' => 'actor', 'action' => 'list'));
+ $this->redirect(array('module' => 'actor', 'action' => 'list'));
}
}
}
Modified:
trunk/apps/qubit/modules/actor/actions/deleteContactInformationAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/actor/actions/deleteContactInformationAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++
trunk/apps/qubit/modules/actor/actions/deleteContactInformationAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -33,11 +33,11 @@
//right now contact information is only created and deleted via the
repository module
if (strlen($template = $this->getRequestParameter('returnTemplate')) > 0)
{
- return $this->redirect(array('module' => 'repository', 'action' =>
'edit', 'repository_template' => $template, 'id' => $this->actorId));
+ $this->redirect(array('module' => 'repository', 'action' => 'edit',
'repository_template' => $template, 'id' => $this->actorId));
}
else
{
- return $this->redirect(array('module' => 'repository', 'action' =>
'edit', 'id' => $this->actorId));
+ $this->redirect(array('module' => 'repository', 'action' => 'edit', 'id'
=> $this->actorId));
}
}
}
Modified: trunk/apps/qubit/modules/actor/actions/deleteNoteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/deleteNoteAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/actor/actions/deleteNoteAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -34,17 +34,17 @@
// an absolute URL or an array containing module and action
// (Pre-pend code copied from sfWebController->genUrl() method)
$next = 'http'.($request->isSecure() ? 's' :
'').'://'.$request->getHost().$this->getRequestParameter('next');
- return $this->redirect($next);
+ $this->redirect($next);
}
else
{
if (strlen($template = $this->getRequestParameter('returnTemplate')) > 0)
{
- return $this->redirect(array('module' => 'actor', 'action' => 'edit',
'actor_template' => $template, 'id' => $this->actorId));
+ $this->redirect(array('module' => 'actor', 'action' => 'edit',
'actor_template' => $template, 'id' => $this->actorId));
}
else
{
- return $this->redirect(array('module' => 'actor', 'action' => 'edit',
'id' => $this->actorId));
+ $this->redirect(array('module' => 'actor', 'action' => 'edit', 'id' =>
$this->actorId));
}
}
}
Modified: trunk/apps/qubit/modules/actor/actions/deleteOtherNameAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/deleteOtherNameAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/actor/actions/deleteOtherNameAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -35,17 +35,17 @@
// (Pre-pend code copied from sfWebController->genUrl() method)
$next = 'http'.($request->isSecure() ? 's' :
'').'://'.$request->getHost().$this->getRequestParameter('next');
- return $this->redirect($next);
+ $this->redirect($next);
}
else
{
if (strlen($template = $this->getRequestParameter('returnTemplate')) > 0)
{
- return $this->redirect(array('module' => 'actor', 'action' => 'edit',
'actor_template' => $template, 'id' => $this->actorId));
+ $this->redirect(array('module' => 'actor', 'action' => 'edit',
'actor_template' => $template, 'id' => $this->actorId));
}
else
{
- return $this->redirect(array('module' => 'actor', 'action' => 'edit',
'id' => $this->actorId));
+ $this->redirect(array('module' => 'actor', 'action' => 'edit', 'id' =>
$this->actorId));
}
}
}
Modified: trunk/apps/qubit/modules/actor/actions/deletePropertyAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/deletePropertyAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/actor/actions/deletePropertyAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -33,17 +33,17 @@
// an absolute URL or an array containing module and action
// (Pre-pend code copied from sfWebController->genUrl() method)
$next = 'http'.($request->isSecure() ? 's' :
'').'://'.$request->getHost().$this->getRequestParameter('next');
- return $this->redirect($next);
+ $this->redirect($next);
}
else
{
if (strlen($template = $this->getRequestParameter('returnTemplate')) > 0)
{
- return $this->redirect(array('module' => 'actor', 'action' => 'edit',
'actor_template' => $template, 'id' => $this->actorId));
+ $this->redirect(array('module' => 'actor', 'action' => 'edit',
'actor_template' => $template, 'id' => $this->actorId));
}
else
{
- return $this->redirect(array('module' => 'actor', 'action' => 'edit',
'id' => $this->actorId));
+ $this->redirect(array('module' => 'actor', 'action' => 'edit', 'id' =>
$this->actorId));
}
}
}
Modified:
trunk/apps/qubit/modules/actor/actions/deleteTermRelationAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/deleteTermRelationAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/actor/actions/deleteTermRelationAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -31,11 +31,11 @@
if (strlen($template = $this->getRequestParameter('returnTemplate')) > 0)
{
- return $this->redirect(array('module' => 'actor', 'action' => 'edit',
'actor_template' => $template, 'id' => $this->actorId));
+ $this->redirect(array('module' => 'actor', 'action' => 'edit',
'actor_template' => $template, 'id' => $this->actorId));
}
else
{
- return $this->redirect(array('module' => 'actor', 'action' => 'edit',
'id' => $this->actorId));
+ $this->redirect(array('module' => 'actor', 'action' => 'edit', 'id' =>
$this->actorId));
}
}
}
Modified: trunk/apps/qubit/modules/actor/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/editAction.class.php Sun Sep 20
16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/actor/actions/editAction.class.php Sun Sep 20
16:45:44 2009 (r3452)
@@ -113,15 +113,15 @@
//set redirect if actor edit was called from another module
if ($this->getRequestParameter('repositoryReroute'))
{
- return
$this->redirect('repository/edit?id='.$this->getRequestParameter('repositoryReroute'));
+
$this->redirect('repository/edit?id='.$this->getRequestParameter('repositoryReroute'));
}
if ($this->getRequestParameter('informationObjectReroute'))
{
- return
$this->redirect('informationobject/edit?id='.$this->getRequestParameter('informationObjectReroute'));
+
$this->redirect('informationobject/edit?id='.$this->getRequestParameter('informationObjectReroute'));
}
- return $this->redirect(array('module' => 'actor', 'action' => 'show',
'id' => $this->actor->getId()));
+ $this->redirect(array('module' => 'actor', 'action' => 'show', 'id' =>
$this->actor->getId()));
}
}
Modified:
trunk/apps/qubit/modules/actor/actions/editContactInformationAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/actor/actions/editContactInformationAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++
trunk/apps/qubit/modules/actor/actions/editContactInformationAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -43,11 +43,11 @@
if ($this->getRequestParameter('repositoryReroute'))
{
//set redirect if contactInformation edit was called from the
repository module
- return $this->redirect(array('module' => 'repository', 'action' =>
'edit', 'id' => $this->getRequestParameter('repositoryReroute')));
+ $this->redirect(array('module' => 'repository', 'action' => 'edit',
'id' => $this->getRequestParameter('repositoryReroute')));
}
else
{
- return $this->redirect(array('module' => 'actor', 'action' => 'edit',
'id' => $contactInformation->getActorId()));
+ $this->redirect(array('module' => 'actor', 'action' => 'edit', 'id' =>
$contactInformation->getActorId()));
}
}
} //close execute()
Modified: trunk/apps/qubit/modules/digitalobject/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/deleteAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/digitalobject/actions/deleteAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -40,6 +40,6 @@
$digitalObject->delete();
// Redirect to edit page for parent Info Object
- return
$this->redirect('informationobject/edit?id='.$informationObject->getId());
+ $this->redirect('informationobject/edit?id='.$informationObject->getId());
}
}
Modified: trunk/apps/qubit/modules/digitalobject/actions/updateAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/updateAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/digitalobject/actions/updateAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -41,6 +41,6 @@
$digitalObject->save();
// Return to edit page
- return $this->redirect('digitalobject/edit?id='.$digitalObject->getId());
+ $this->redirect('digitalobject/edit?id='.$digitalObject->getId());
}
}
Modified: trunk/apps/qubit/modules/i18n/actions/updateAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/i18n/actions/updateAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/i18n/actions/updateAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -54,6 +54,6 @@
}
}
- return $this->redirect('i18n/listDefaultContentTranslation');
+ $this->redirect('i18n/listDefaultContentTranslation');
}
}
Modified:
trunk/apps/qubit/modules/informationobject/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/deleteAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/informationobject/actions/deleteAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -46,7 +46,7 @@
$descendant->delete();
}
- return $this->redirect(array('module' => 'informationobject', 'action'
=> 'list', 'id' => $this->informationObject->parent->id));
+ $this->redirect(array('module' => 'informationobject', 'action' =>
'list', 'id' => $this->informationObject->parent->id));
}
}
}
Modified:
trunk/apps/qubit/modules/informationobject/actions/deleteEventAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/informationobject/actions/deleteEventAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++
trunk/apps/qubit/modules/informationobject/actions/deleteEventAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -30,11 +30,11 @@
if (strlen($template = $this->getRequestParameter('returnTemplate')) > 0)
{
- return $this->redirect(array('module' => 'informationobject', 'action'
=> 'edit', 'informationobject_template' => $template, 'id' =>
$this->informationObject->getId()));
+ $this->redirect(array('module' => 'informationobject', 'action' =>
'edit', 'informationobject_template' => $template, 'id' =>
$this->informationObject->getId()));
}
else
{
- return $this->redirect(array('module' => 'informationobject', 'action'
=> 'edit', 'id' => $this->informationObject->getId()));
+ $this->redirect(array('module' => 'informationobject', 'action' =>
'edit', 'id' => $this->informationObject->getId()));
}
}
}
Modified:
trunk/apps/qubit/modules/informationobject/actions/deleteNoteAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/informationobject/actions/deleteNoteAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++
trunk/apps/qubit/modules/informationobject/actions/deleteNoteAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -31,11 +31,11 @@
if (strlen($template = $this->getRequestParameter('returnTemplate')) > 0)
{
- return $this->redirect(array('module' => 'informationobject', 'action'
=> 'edit', 'informationobject_template' => $template, 'id' =>
$this->informationObject->getId()));
+ $this->redirect(array('module' => 'informationobject', 'action' =>
'edit', 'informationobject_template' => $template, 'id' =>
$this->informationObject->getId()));
}
else
{
- return $this->redirect(array('module' => 'informationobject', 'action'
=> 'edit', 'id' => $this->informationObject->getId()));
+ $this->redirect(array('module' => 'informationobject', 'action' =>
'edit', 'id' => $this->informationObject->getId()));
}
}
}
Modified:
trunk/apps/qubit/modules/informationobject/actions/deletePropertyAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/informationobject/actions/deletePropertyAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++
trunk/apps/qubit/modules/informationobject/actions/deletePropertyAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -28,11 +28,11 @@
if (strlen($template = $this->getRequestParameter('returnTemplate')) > 0)
{
- return $this->redirect(array('module' => 'informationobject', 'action'
=> 'edit', 'informationobject_template' => $template, 'id' =>
$this->informationObject->getId()));
+ $this->redirect(array('module' => 'informationobject', 'action' =>
'edit', 'informationobject_template' => $template, 'id' =>
$this->informationObject->getId()));
}
else
{
- return $this->redirect(array('module' => 'informationobject', 'action'
=> 'edit', 'id' => $this->informationObject->getId()));
+ $this->redirect(array('module' => 'informationobject', 'action' =>
'edit', 'id' => $this->informationObject->getId()));
}
}
}
Modified:
trunk/apps/qubit/modules/informationobject/actions/deleteTermRelationAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/informationobject/actions/deleteTermRelationAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++
trunk/apps/qubit/modules/informationobject/actions/deleteTermRelationAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -30,11 +30,11 @@
if (strlen($template = $this->getRequestParameter('returnTemplate')) > 0)
{
- return $this->redirect(array('module' => 'informationobject', 'action'
=> 'edit', 'informationobject_template' => $template, 'id' =>
$this->informationObject->getId()));
+ $this->redirect(array('module' => 'informationobject', 'action' =>
'edit', 'informationobject_template' => $template, 'id' =>
$this->informationObject->getId()));
}
else
{
- return $this->redirect(array('module' => 'informationobject', 'action'
=> 'edit', 'id' => $this->informationObject->getId()));
+ $this->redirect(array('module' => 'informationobject', 'action' =>
'edit', 'id' => $this->informationObject->getId()));
}
}
}
Modified: trunk/apps/qubit/modules/map/actions/actions.class.php
==============================================================================
--- trunk/apps/qubit/modules/map/actions/actions.class.php Sun Sep 20
16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/map/actions/actions.class.php Sun Sep 20
16:45:44 2009 (r3452)
@@ -21,7 +21,7 @@
{
public function executeIndex()
{
- return $this->forward('map', 'list');
+ $this->forward('map', 'list');
}
public function executeList()
@@ -63,7 +63,7 @@
$map->save();
- return $this->redirect('map/edit?id='.$map->getId());
+ $this->redirect('map/edit?id='.$map->getId());
}
public function executeDelete()
@@ -74,6 +74,6 @@
$map->delete();
- return $this->redirect('map/list');
+ $this->redirect('map/list');
}
}
Modified:
trunk/apps/qubit/modules/map/actions/deletePlaceMapRelationAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/map/actions/deletePlaceMapRelationAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/map/actions/deletePlaceMapRelationAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -29,6 +29,6 @@
$placeMapRelation->delete();
- return $this->redirect('map/edit?id='.$mapId);
+ $this->redirect('map/edit?id='.$mapId);
}
}
Modified:
trunk/apps/qubit/modules/map/actions/updatePlaceMapRelationAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/map/actions/updatePlaceMapRelationAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/map/actions/updatePlaceMapRelationAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -40,6 +40,6 @@
$placeMapRelation->save();
- return $this->redirect('map/edit?id='.$placeMapRelation->getMapId());
+ $this->redirect('map/edit?id='.$placeMapRelation->getMapId());
}
}
Modified: trunk/apps/qubit/modules/menu/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/menu/actions/deleteAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/menu/actions/deleteAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -32,6 +32,6 @@
}
// TODO: else populate an error?
- return $this->redirect('menu/list');
+ $this->redirect('menu/list');
}
}
\ No newline at end of file
Modified: trunk/apps/qubit/modules/physicalobject/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/physicalobject/actions/deleteAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/physicalobject/actions/deleteAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -45,6 +45,6 @@
// an absolute URL or an array containing module and action
// (Pre-pend code copied from sfWebController->genUrl() method)
$next = 'http'.($request->isSecure() ? 's' :
'').'://'.$request->getHost().$this->getRequestParameter('next');
- return $this->redirect($next);
+ $this->redirect($next);
}
}
Modified: trunk/apps/qubit/modules/physicalobject/actions/updateAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/physicalobject/actions/updateAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/physicalobject/actions/updateAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -55,11 +55,11 @@
// an absolute URL or an array containing module and action
// (Pre-pend code copied from sfWebController->genUrl() method)
$next = 'http'.($request->isSecure() ? 's' :
'').'://'.$request->getHost().$this->getRequestParameter('next');
- return $this->redirect($next);
+ $this->redirect($next);
}
// Default redirect
- return $this->redirect('physicalobject/edit?id='.$physicalObject->getId());
+ $this->redirect('physicalobject/edit?id='.$physicalObject->getId());
}
Modified: trunk/apps/qubit/modules/place/actions/actions.class.php
==============================================================================
--- trunk/apps/qubit/modules/place/actions/actions.class.php Sun Sep 20
16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/place/actions/actions.class.php Sun Sep 20
16:45:44 2009 (r3452)
@@ -92,7 +92,7 @@
$place->save();
- return $this->redirect('place/edit?id='.$place->getId());
+ $this->redirect('place/edit?id='.$place->getId());
}
public function executeDelete()
@@ -103,6 +103,6 @@
$place->delete();
- return $this->redirect('place/list');
+ $this->redirect('place/list');
}
}
Modified: trunk/apps/qubit/modules/relation/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/relation/actions/deleteAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/relation/actions/deleteAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -41,6 +41,6 @@
// Do delete
$this->relation->delete();
- return $this->redirect($next);
+ $this->redirect($next);
}
}
Modified: trunk/apps/qubit/modules/repository/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/deleteAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/repository/actions/deleteAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -41,7 +41,7 @@
$this->repository->delete();
- return $this->redirect(array('module' => 'repository', 'action' =>
'list'));
+ $this->redirect(array('module' => 'repository', 'action' => 'list'));
}
}
}
Modified:
trunk/apps/qubit/modules/repository/actions/deleteTermRelationAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/repository/actions/deleteTermRelationAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++
trunk/apps/qubit/modules/repository/actions/deleteTermRelationAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -31,11 +31,11 @@
if (strlen($template = $this->getRequestParameter('returnTemplate')) > 0)
{
- return $this->redirect(array('module' => 'repository', 'action' =>
'edit', 'repository_template' => $template, 'id' => $this->repositoryId));
+ $this->redirect(array('module' => 'repository', 'action' => 'edit',
'repository_template' => $template, 'id' => $this->repositoryId));
}
else
{
- return $this->redirect(array('module' => 'repository', 'action' =>
'edit', 'id' => $this->repositoryId));
+ $this->redirect(array('module' => 'repository', 'action' => 'edit', 'id'
=> $this->repositoryId));
}
}
}
Modified: trunk/apps/qubit/modules/repository/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/editAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/repository/actions/editAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -80,7 +80,7 @@
$this->processForm();
// return to show template
- return $this->redirect(array('module' => 'repository', 'action' =>
'show', 'id' => $this->repository->getId()));
+ $this->redirect(array('module' => 'repository', 'action' => 'show', 'id'
=> $this->repository->getId()));
}
}
Modified: trunk/apps/qubit/modules/settings/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/settings/actions/deleteAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/settings/actions/deleteAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -33,7 +33,7 @@
// TODO: else populate an error?
$this->refreshSettings();
- return $this->redirect('settings/list');
+ $this->redirect('settings/list');
}
protected function refreshSettings()
Modified: trunk/apps/qubit/modules/settings/actions/updateAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/settings/actions/updateAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/settings/actions/updateAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -56,7 +56,7 @@
}
catch (Exception $e)
{
- return $this->redirect(array('module' => 'settings', 'action' =>
'list'));
+ $this->redirect(array('module' => 'settings', 'action' => 'list'));
}
$setting = new QubitSetting;
$setting->setName($this->getRequestParameter('language_code'));
@@ -71,7 +71,7 @@
// go directly back, do not update anything else
$this->refreshSettings();
- return $this->redirect('settings/list');
+ $this->redirect('settings/list');
}
// update any existing values
@@ -93,7 +93,7 @@
}
$this->refreshSettings();
- return $this->redirect('settings/list');
+ $this->redirect('settings/list');
}
protected function refreshSettings()
Modified: trunk/apps/qubit/modules/staticpage/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/staticpage/actions/deleteAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/staticpage/actions/deleteAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -27,6 +27,6 @@
$staticPage->delete();
- return $this->redirect('staticpage/list');
+ $this->redirect('staticpage/list');
}
}
Modified: trunk/apps/qubit/modules/staticpage/actions/updateAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/staticpage/actions/updateAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/staticpage/actions/updateAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -55,6 +55,6 @@
$staticPage->save();
- return $this->redirect(array('module' => 'staticpage', 'action' =>
'static', 'permalink' => $staticPage->getPermalink()));
+ $this->redirect(array('module' => 'staticpage', 'action' => 'static',
'permalink' => $staticPage->getPermalink()));
}
}
Modified: trunk/apps/qubit/modules/term/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/deleteAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/term/actions/deleteAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -35,11 +35,11 @@
if (null != $taxonomyId)
{
- return $this->redirect(array('module' => 'term', 'action' => 'list',
'taxonomyId' => $taxonomyId));
+ $this->redirect(array('module' => 'term', 'action' => 'list',
'taxonomyId' => $taxonomyId));
}
else
{
- return $this->redirect(array('module' => 'term', 'action' => 'list'));
+ $this->redirect(array('module' => 'term', 'action' => 'list'));
}
}
}
Modified: trunk/apps/qubit/modules/term/actions/deleteNoteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/deleteNoteAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/term/actions/deleteNoteAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -31,6 +31,6 @@
$returnTemplate = $this->getRequestParameter('ReturnTemplate');
- return
$this->redirect('term/edit/?id='.$term->getId().'&template='.$returnTemplate);
+
$this->redirect('term/edit/?id='.$term->getId().'&template='.$returnTemplate);
}
}
Modified: trunk/apps/qubit/modules/term/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/editAction.class.php Sun Sep 20
16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/term/actions/editAction.class.php Sun Sep 20
16:45:44 2009 (r3452)
@@ -68,7 +68,7 @@
// Redirect to show template on successful update
if (!$this->hasWarning)
{
- return $this->redirect(array('module' => 'term', 'action' => 'show',
'id' => $this->term->id));
+ $this->redirect(array('module' => 'term', 'action' => 'show', 'id' =>
$this->term->id));
}
}
Modified: trunk/apps/qubit/modules/user/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/deleteAction.class.php Sun Sep
20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/user/actions/deleteAction.class.php Sun Sep
20 16:45:44 2009 (r3452)
@@ -27,6 +27,6 @@
$user->delete();
- return $this->redirect('user/list');
+ $this->redirect('user/list');
}
}
Modified: trunk/apps/qubit/modules/user/actions/passwordUpdateAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/passwordUpdateAction.class.php
Sun Sep 20 16:22:24 2009 (r3451)
+++ trunk/apps/qubit/modules/user/actions/passwordUpdateAction.class.php
Sun Sep 20 16:45:44 2009 (r3452)
@@ -28,6 +28,6 @@
$user->save();
- return $this->redirect('user/show?id='.$this->getRequestParameter('id'));
+ $this->redirect('user/show?id='.$this->getRequestParameter('id'));
}
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
