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

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

Revision: 624
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=624&view=rev
Author:   matijsdejong
Date:     2012-04-19 14:24:44 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
Bug fix where tracks where shown multiple times if a user belonged to multiple organizations
Code commented out meant for 1.5.4

Modified Paths:
--------------
    trunk/library/classes/Gems/Tracker/Model/RespondentTrackModel.php
    trunk/library/classes/Gems/Tracker/Token.php
    trunk/library/configs/db/patches.sql
    trunk/library/configs/db/tables/gems__tokens.200.sql

Modified: trunk/library/classes/Gems/Tracker/Model/RespondentTrackModel.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Model/RespondentTrackModel.php	2012-04-19 10:57:42 UTC (rev 623)
+++ trunk/library/classes/Gems/Tracker/Model/RespondentTrackModel.php	2012-04-19 14:24:44 UTC (rev 624)
@@ -64,7 +64,7 @@
     {
         parent::__construct('surveys', 'gems__respondent2track', 'gr2t');
         $this->addTable('gems__respondents',     array('gr2t_id_user' => 'grs_id_user'));
-        $this->addTable('gems__respondent2org',  array('gr2t_id_user' => 'gr2o_id_user'));
+        $this->addTable('gems__respondent2org',  array('gr2t_id_user' => 'gr2o_id_user', 'gr2t_id_organization' => 'gr2o_id_organization'));
         $this->addTable('gems__tracks',          array('gr2t_id_track' => 'gtr_id_track'));
         $this->addTable('gems__reception_codes', array('gr2t_reception_code' => 'grc_id_reception_code'));
         $this->addLeftTable('gems__staff',       array('gr2t_created_by' => 'gsf_id_user'));

Modified: trunk/library/classes/Gems/Tracker/Token.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token.php	2012-04-19 10:57:42 UTC (rev 623)
+++ trunk/library/classes/Gems/Tracker/Token.php	2012-04-19 14:24:44 UTC (rev 624)
@@ -888,7 +888,8 @@
             $values['gto_start_time'] = new Zend_Db_Expr('CURRENT_TIMESTAMP');
             $values['gto_in_source']  = 1;
         }
-        $values['gto_by'] = $userId;
+        $values['gto_by']         = $userId;
+        // 1.5.4 $values['gto_return_url'] = $_SERVER["HTTP_REFERER"];
 
         $this->_updateToken($values, $userId);
 

Modified: trunk/library/configs/db/patches.sql
===================================================================
--- trunk/library/configs/db/patches.sql	2012-04-19 10:57:42 UTC (rev 623)
+++ trunk/library/configs/db/patches.sql	2012-04-19 14:24:44 UTC (rev 624)
@@ -393,3 +393,7 @@
 -- PATCH: make reset keys unique so we now whose key it is
 ALTER TABLE `gems__user_passwords` ADD UNIQUE KEY (gup_reset_key);
 ALTER TABLE `gems__staff` ADD UNIQUE KEY (gsf_reset_key);
+
+-- GEMS VERSION: 47
+-- PATCH: Add return url to tokens
+-- ALTER TABLE gems__tokens ADD gto_return_url varchar(250) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null default null AFTER gto_reception_code;

Modified: trunk/library/configs/db/tables/gems__tokens.200.sql
===================================================================
--- trunk/library/configs/db/tables/gems__tokens.200.sql	2012-04-19 10:57:42 UTC (rev 623)
+++ trunk/library/configs/db/tables/gems__tokens.200.sql	2012-04-19 14:24:44 UTC (rev 624)
@@ -2,17 +2,17 @@
 CREATE TABLE if not exists gems__tokens (
         gto_id_token varchar(9) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
 
-        gto_id_respondent_track bigint unsigned not null 
+        gto_id_respondent_track bigint unsigned not null
                 references gems__respondent2track (gr2t_id_respondent_track),
-        gto_id_round bigint unsigned not null 
+        gto_id_round bigint unsigned not null
                 references gems__rounds (gro_id_round),
 
         -- non-changing fields calculated from previous two:
-        gto_id_respondent bigint unsigned not null 
+        gto_id_respondent bigint unsigned not null
                 references gems__respondents (grs_id_user),
-        gto_id_organization bigint unsigned not null 
+        gto_id_organization bigint unsigned not null
                 references gems__organizations (gor_id_organization),
-        gto_id_track bigint unsigned not null 
+        gto_id_track bigint unsigned not null
                 references gems__track (gtr_id_track),
 
         -- values initially filled from gems__rounds, but that may get different values later on
@@ -25,14 +25,14 @@
         -- real data
         gto_valid_from      datetime,
         gto_valid_until     datetime,
-        gto_mail_sent_date  date, 
-        gto_next_mail_date  date, 
+        gto_mail_sent_date  date,
+        gto_next_mail_date  date,
 
-        gto_start_time      datetime, 
+        gto_start_time      datetime,
         gto_in_source       boolean not null default 0,
         gto_by              bigint(20) unsigned NULL,
 
-        gto_completion_time datetime, 
+        gto_completion_time datetime,
         gto_duration_in_sec bigint(20) unsigned NULL,
         gto_followup_date   date, -- depreciated
         gto_result          varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
@@ -41,6 +41,8 @@
         gto_reception_code  varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' default 'OK' not null
                 references gems__reception_codes (grc_id_reception_code),
 
+        -- gto_return_url      varchar(250) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null default null,
+
         gto_changed timestamp not null default current_timestamp on update current_timestamp,
         gto_changed_by bigint unsigned not null,
         gto_created timestamp not null,

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