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

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

Revision: 578
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=578&view=rev
Author:   matijsdejong
Date:     2012-03-29 19:57:58 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
Implement generic return mechanism for ask/return
Added tables to TokenSelect.php

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/AskAction.php
    trunk/library/classes/Gems/Tracker/Token/TokenSelect.php

Modified: trunk/library/classes/Gems/Default/AskAction.php
===================================================================
--- trunk/library/classes/Gems/Default/AskAction.php	2012-03-29 17:08:31 UTC (rev 577)
+++ trunk/library/classes/Gems/Default/AskAction.php	2012-03-29 19:57:58 UTC (rev 578)
@@ -303,7 +303,13 @@
                     return;
 
                 default:
-                    $parameters['controller'] = 'respondent';
+                    // Allow open specification of return
+                    if (strpos($return, '/') !== false) {
+                        $parameters = MUtil_Ra::pairs(explode('/', $return));
+                        // MUtil_Echo::track($parameters);
+                    } else {
+                        $parameters['controller'] = 'respondent';
+                    }
             }
                 $this->_reroute($parameters, true);
         } else {

Modified: trunk/library/classes/Gems/Tracker/Token/TokenSelect.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token/TokenSelect.php	2012-03-29 17:08:31 UTC (rev 577)
+++ trunk/library/classes/Gems/Tracker/Token/TokenSelect.php	2012-03-29 19:57:58 UTC (rev 578)
@@ -136,6 +136,20 @@
     }
 
     /**
+     * Add Respondent Track info to the select statement
+     *
+     * @param string|array $fields
+     * @return Gems_Tracker_Token_TokenSelect
+     */
+    public function andRespondentTracks($fields = '*') {
+        $this->sql_select->join('gems__respondent2track',
+                'gto_id_respondent_track = gr2t_id_respondent_track',
+                $fields);
+
+        return $this;
+    }
+
+    /**
      * Adds round info to the select statement
      *
      * @param string|array $fields

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