[Gemstracker-svn] SF.net SVN: gemstracker:[682] trunk/library

[<gem...@li...>]

Revision: 682
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=682&view=rev
Author:   mennodekker
Date:     2012-05-15 08:49:17 +0000 (Tue, 15 May 2012)
Log Message:
-----------
Defined some roles for researcher (only for new projects) + fixed bug where login redirect to a container would result in an error

Modified Paths:
--------------
    trunk/library/classes/Gems/User/User.php
    trunk/library/configs/db/tables/gems__roles.20.sql

Modified: trunk/library/classes/Gems/User/User.php
===================================================================
--- trunk/library/classes/Gems/User/User.php	2012-05-15 08:11:18 UTC (rev 681)
+++ trunk/library/classes/Gems/User/User.php	2012-05-15 08:49:17 UTC (rev 682)
@@ -937,11 +937,21 @@
         if ($menuItem) {
             // Prevent redirecting to the current page.
             if (! ($menuItem->is('controller', $request->getControllerName()) && $menuItem->is('action', $request->getActionName()))) {
-                //Probably a debug statement so commented out MD20120308
-                //echo $menuItem->get('label') . '<br/>';
+                if (!$menuItem->has('controller')) {
+                    //This is a container, try to find first active child
+                    $item = $menuItem;
+                    foreach ($item->sortByOrder()->getChildren() as $menuItem) {
+                        if ($menuItem->isAllowed() && $menuItem->has('controller')) {
+                            break;
+                        }
+                        $menuItem = null;
+                    }
+                }
 
-                $redirector = Zend_Controller_Action_HelperBroker::getStaticHelper('redirector');
-                $redirector->gotoRoute($menuItem->toRouteUrl($request), null, true);
+                if ($menuItem) {
+                    $redirector = Zend_Controller_Action_HelperBroker::getStaticHelper('redirector');
+                    $redirector->gotoRoute($menuItem->toRouteUrl($request), null, true);
+                }
             }
         }
 

Modified: trunk/library/configs/db/tables/gems__roles.20.sql
===================================================================
--- trunk/library/configs/db/tables/gems__roles.20.sql	2012-05-15 08:11:18 UTC (rev 681)
+++ trunk/library/configs/db/tables/gems__roles.20.sql	2012-05-15 08:49:17 UTC (rev 682)
@@ -31,6 +31,6 @@
     ('security','security','','guest', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
     ('staff','staff','pr.option.edit,pr.option.password,pr.plan,pr.plan.overview,pr.plan.token,pr.project,pr.project.questions,pr.respondent.create,pr.respondent.edit,pr.respondent.who,pr.setup,pr.staff,pr.survey,pr.survey.create,pr.token,pr.token.answers,pr.token.delete,pr.token.edit,pr.token.mail,pr.token.print,pr.track,pr.track.create,pr.track.delete,pr.track.edit,pr.respondent.reportdeath','guest', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
     ('physician','physician','','staff', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
-    ('researcher','researcher','pr.invitation,pr.result,pr.islogin','', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
+    ('researcher','researcher','pr.project-information.changelog,pr.contact,pr.export,pr.plan.token,pr.plan.respondent,pr.plan.overview,pr.option.password,pr.option.edit,pr.organization-switch,pr.islogin','', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
     ('admin','admin','pr.consent,pr.consent.create,pr.consent.edit,pr.group,pr.role,pr.mail,pr.mail.create,pr.mail.delete,pr.mail.edit,pr.mail.log,pr.organization,pr.organization-switch,pr.plan.overview.excel,pr.plan.respondent,pr.plan.respondent.excel,pr.plan.token.excel,pr.project-information,pr.reception,pr.reception.create,pr.reception.edit,pr.respondent.choose-org,pr.respondent.delete,pr.respondent.result,pr.source,pr.staff.create,pr.staff.delete,pr.staff.edit,pr.staff.see.all,pr.survey-maintenance,pr.track-maintenance,pr.token.mail.freetext','staff,researcher,security', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
     ('super','super','pr.consent.delete,pr.country,pr.country.create,pr.country.delete,pr.country.edit,pr.database,pr.database.create,pr.database.delete,pr.database.edit,pr.database.execute,pr.database.patches,pr.group.create,pr.group.edit,pr.language,pr.mail.server,pr.mail.server.create,pr.mail.server.delete,pr.mail.server.edit,pr.organization.create,pr.organization.edit,pr.plan.choose-org,pr.plan.mail-as-application,pr.reception.delete,pr.role.create,pr.role.edit,pr.source.create,pr.source.edit,pr.source.synchronize,pr.source.synchronize-all,pr.staff.edit.all,pr.survey-maintenance.edit,pr.track-maintenance.create,pr.track-maintenance.edit,pr.maintenance','admin', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.