[Gemstracker-svn] SF.net SVN: gemstracker:[765] trunk/library/classes/Gems

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

Revision: 765
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=765&view=rev
Author:   matijsdejong
Date:     2012-06-14 16:10:18 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
First attempt to get menu working with multi org. Is promising.

Modified Paths:
--------------
    trunk/library/classes/Gems/Menu/SubMenuItem.php
    trunk/library/classes/Gems/Menu.php

Modified: trunk/library/classes/Gems/Menu/SubMenuItem.php
===================================================================
--- trunk/library/classes/Gems/Menu/SubMenuItem.php	2012-06-14 15:30:38 UTC (rev 764)
+++ trunk/library/classes/Gems/Menu/SubMenuItem.php	2012-06-14 16:10:18 UTC (rev 765)
@@ -154,12 +154,10 @@
             foreach ($this->_parameters as $param => $name) {
                 $parameters[$param] = $source->getMenuParameter($name, $param);
                 if (Gems_Menu::$verbose) {
-                        MUtil_Echo::r($param . '/' . $name . ' => ' . $parameters[$param], $this->get('label'));
+                    MUtil_Echo::r($param . '/' . $name . ' => ' . $parameters[$param], $this->get('label'));
                 }
             }
         }
-
-        return false;
     }
 
     private function _applyParameterSources(Gems_Menu_ParameterCollector $source, array &$parameters, $raiseConditions)

Modified: trunk/library/classes/Gems/Menu.php
===================================================================
--- trunk/library/classes/Gems/Menu.php	2012-06-14 15:30:38 UTC (rev 764)
+++ trunk/library/classes/Gems/Menu.php	2012-06-14 16:10:18 UTC (rev 765)
@@ -262,11 +262,14 @@
 
     public function addRespondentPage($label)
     {
+        $params = array(MUtil_Model::REQUEST_ID => 'gr2o_patient_nr');
+        // $params = array(MUtil_Model::REQUEST_ID . '1'  => 'gr2o_patient_nr', MUtil_Model::REQUEST_ID . '2' => 'gr2o_id_organization');
+
         // MAIN RESPONDENTS ITEM
         $page = $this->addPage($label, 'pr.respondent', 'respondent');
         $page->addAutofilterAction();
         $page->addCreateAction('pr.respondent.create')->setParameterFilter('can_add_respondents', true);;
-        $page->addShowAction()->addNamedParameters(MUtil_Model::REQUEST_ID, 'gr2o_patient_nr');
+        $page->addShowAction()->setNamedParameters($params);
 
         /*
         iff(
@@ -276,14 +279,14 @@
             );
         */
 
-        $page->addEditAction('pr.respondent.edit')->addNamedParameters(MUtil_Model::REQUEST_ID, 'gr2o_patient_nr');
-        $page->addAction($this->_('Export'), 'pr.respondent.export-html', 'export')->addNamedParameters(MUtil_Model::REQUEST_ID, 'gr2o_patient_nr');
+        $page->addEditAction('pr.respondent.edit')->setNamedParameters($params);
+        $page->addAction($this->_('Export'), 'pr.respondent.export-html', 'export')->setNamedParameters($params);
 
         if ($this->escort instanceof Gems_Project_Tracks_SingleTrackInterface) {
 
             $trType = 'T';
             $subPage = $page->addPage($this->_('Track'), 'pr.track', 'track', 'show-track')
-                ->addNamedParameters(MUtil_Model::REQUEST_ID, 'gr2o_patient_nr')
+                ->setNamedParameters($params)
                 ->addHiddenParameter(Gems_Model::TRACK_ID, $this->escort->getTrackId(), 'gtr_track_type', $trType);
 
             $tkPages[$trType] = $subPage->addAction($this->_('Token'), 'pr.token', 'show')
@@ -384,7 +387,7 @@
                     ->set('target', MUtil_Model::REQUEST_ID);
         }
 
-        $page->addDeleteAction('pr.respondent.delete')->addNamedParameters(MUtil_Model::REQUEST_ID, 'gr2o_patient_nr');
+        $page->addDeleteAction('pr.respondent.delete')->setNamedParameters($params);
 
         return $page;
     }

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