COmanage Developers List

Author: marie
Date: 2012-10-04 02:37:12 -0400 (Thu, 04 Oct 2012)
New Revision: 379

Modified:
   registry/trunk/app/Controller/CoPersonRolesController.php
   registry/trunk/app/Controller/StandardController.php
Log:
co438 changes in formatting and setting modified redirect for consistency

Modified: registry/trunk/app/Controller/CoPersonRolesController.php
===================================================================
--- registry/trunk/app/Controller/CoPersonRolesController.php   2012-10-02 
02:50:16 UTC (rev 378)
+++ registry/trunk/app/Controller/CoPersonRolesController.php   2012-10-04 
06:37:12 UTC (rev 379)
@@ -385,15 +385,14 @@
     // On add, redirect to edit view again so MVPAs are available.
     // For everything else, return to co_people
    
-    if($this->action == 'add'){
+    if($this->action == 'add') {
       $params = array('action' => 'edit',
                       $this->CoPersonRole->id,
                       'co'     => $this->cur_co['Co']['id'],
                       'tab'    => 'role'
                      );
       $this->redirect($params);
-    }else
-    {
+    } else {
       $params = array('controller' => 'co_people',
                       'action'     => 'edit',
                       $this->viewVars['co_people'][0]['CoPerson']['id'],

Modified: registry/trunk/app/Controller/StandardController.php
===================================================================
--- registry/trunk/app/Controller/StandardController.php        2012-10-02 
02:50:16 UTC (rev 378)
+++ registry/trunk/app/Controller/StandardController.php        2012-10-04 
06:37:12 UTC (rev 379)
@@ -686,15 +686,16 @@
 
     // Sets tab to be opened by co_people page via jquery
     if($this->viewVars['redirect']['controller'] == 'co_people'
-       || $this->viewVars['redirect']['controller'] == 'org_identities'
-      )
-    {
+       || $this->viewVars['redirect']['controller'] == 'org_identities') {
       if($this->redirectTab)
         $redirect['tab'] = $this->redirectTab;
     }
 
-    if($this->requires_person)
+    if($this->requires_person) {
+      $this->set('redirect', $redirect);
       $this->redirect($redirect);
+    }
+
     if(isset($this->cur_co))
       $this->redirect(array('action' => 'index', 'co' => 
Sanitize::html($this->cur_co['Co']['id'])));
     else