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

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

Revision: 782
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=782&view=rev
Author:   matijsdejong
Date:     2012-06-22 12:25:39 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
Fixed bug in survey return urls and made the hidden model slightly more adapted to the current situation

Modified Paths:
--------------
    trunk/library/classes/Gems/Model/HiddenOrganizationModel.php
    trunk/library/classes/Gems/Tracker/Token.php

Modified: trunk/library/classes/Gems/Model/HiddenOrganizationModel.php
===================================================================
--- trunk/library/classes/Gems/Model/HiddenOrganizationModel.php	2012-06-22 10:46:48 UTC (rev 781)
+++ trunk/library/classes/Gems/Model/HiddenOrganizationModel.php	2012-06-22 12:25:39 UTC (rev 782)
@@ -83,7 +83,7 @@
     {
         if ($parameters) {
             // Allow use when passed only an ID value
-            if (isset($parameters[MUtil_Model::REQUEST_ID])) {
+            if (isset($parameters[MUtil_Model::REQUEST_ID]) && (! isset($parameters[MUtil_Model::REQUEST_ID1], $parameters[MUtil_Model::REQUEST_ID2]))) {
 
                 $id    = $parameters[MUtil_Model::REQUEST_ID];
                 $keys  = $this->getKeys();

Modified: trunk/library/classes/Gems/Tracker/Token.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token.php	2012-06-22 10:46:48 UTC (rev 781)
+++ trunk/library/classes/Gems/Tracker/Token.php	2012-06-22 12:25:39 UTC (rev 782)
@@ -367,6 +367,10 @@
             // Do not show the base url as it is in $currentUri
             $surveyReturn['NoBase'] = true;
 
+            // Add route reset to prevet the current parameters to be
+            // added to the url.
+            $surveyReturn['RouteReset'] = true;
+
             return $currentUri . MUtil_Html::urlString($surveyReturn);
             // MUtil_Echo::track($currentUri . MUtil_Html::urlString($surveyReturn));
         }
@@ -1084,6 +1088,8 @@
         $values['gto_by']         = $userId;
         $values['gto_return_url'] = $this->calculateReturnUrl();
 
+        // MUtil_Echo::track($values);
+        
         $this->_updateToken($values, $userId);
 
         $this->handleBeforeAnswering();

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