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

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

Revision: 415
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=415&view=rev
Author:   mennodekker
Date:     2012-01-23 11:04:04 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Saving on session storage and fixing incompatibility between tracker and token in selection of data that caused problems on deleted respondents

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

Modified: trunk/library/classes/Gems/Tracker/Token.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token.php	2012-01-23 08:33:00 UTC (rev 414)
+++ trunk/library/classes/Gems/Tracker/Token.php	2012-01-23 11:04:04 UTC (rev 415)
@@ -1052,7 +1052,7 @@
         if (is_array($gemsData)) {
             $this->_gemsData = $gemsData + $this->_gemsData;
         } else {
-            $tokenSelect = $this->tracker->getTokenSelect(true);
+            $tokenSelect = $this->tracker->getTokenSelect();
 
             $tokenSelect
                     ->andReceptionCodes()

Modified: trunk/library/classes/Gems/Tracker.php
===================================================================
--- trunk/library/classes/Gems/Tracker.php	2012-01-23 08:33:00 UTC (rev 414)
+++ trunk/library/classes/Gems/Tracker.php	2012-01-23 11:04:04 UTC (rev 415)
@@ -845,7 +845,7 @@
             $tokenRows = $tokenSelect->fetchAll();
 
             foreach ($tokenRows as $tokenData) {
-                $batch->addToken($tokenData, $userId);
+                $batch->addToken($tokenData['gto_id_token'], $userId);
             }
         }
 
@@ -867,7 +867,10 @@
     {
         $userId = $this->_checkUserId($userId);
         $tokenSelect = $this->getTokenSelect();
-        $tokenSelect->andReceptionCodes();
+        $tokenSelect->andReceptionCodes()
+                    ->andRespondents()
+                    ->andRespondentOrganizations()
+                    ->andConsents();
         if ($cond) {
             $tokenSelect->forWhere($cond);
         }
@@ -896,7 +899,10 @@
     {
         $userId = $this->_checkUserId($userId);
         $tokenSelect = $this->getTokenSelect();
-        $tokenSelect->andReceptionCodes();
+        $tokenSelect->andReceptionCodes()
+                    ->andRespondents()
+                    ->andRespondentOrganizations()
+                    ->andConsents();
         if ($cond) {
             $tokenSelect->forWhere($cond);
         }

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