[Gemstracker-svn] SF.net SVN: gemstracker:[493] tags/1.5.1

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

Revision: 493
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=493&view=rev
Author:   mennodekker
Date:     2012-02-16 11:09:51 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
Merged revision(s) 490-491 from trunk:
Added rounds
........
Changed rounds in StandardTokenModel to joinLeft as sometimes there is a token not attached to a round
Removed contact from header_bar in new_project
........

Modified Paths:
--------------
    tags/1.5.1/library/classes/Gems/Tracker/Model/StandardTokenModel.php
    tags/1.5.1/new_project/application/configs/project.ini

Property Changed:
----------------
    tags/1.5.1/
    tags/1.5.1/library/


Property changes on: tags/1.5.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse:306-430,467
/tags/1.5.0beta1:305
   + /branches/1.5.0-pulse:306-430,467
/tags/1.5.0beta1:305
/trunk:490-491


Property changes on: tags/1.5.1/library
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse/library:306-344,346,467
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
   + /branches/1.5.0-pulse/library:306-344,346,467
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/trunk/library:490-491

Modified: tags/1.5.1/library/classes/Gems/Tracker/Model/StandardTokenModel.php
===================================================================
--- tags/1.5.1/library/classes/Gems/Tracker/Model/StandardTokenModel.php	2012-02-16 11:00:36 UTC (rev 492)
+++ tags/1.5.1/library/classes/Gems/Tracker/Model/StandardTokenModel.php	2012-02-16 11:09:51 UTC (rev 493)
@@ -96,6 +96,7 @@
         }
 
         $this->addTable(    'gems__tracks',           array('gto_id_track' => 'gtr_id_track'));
+        $this->addLeftTable('gems__rounds',           array('gto_id_round' => 'gro_id_round'));
         $this->addTable(    'gems__surveys',          array('gto_id_survey' => 'gsu_id_survey'));
         $this->addTable(    'gems__groups',           array('gsu_id_primary_group' => 'ggp_id_group'));
         $this->addTable(    'gems__respondents',      array('gto_id_respondent' => 'grs_id_user'));

Modified: tags/1.5.1/new_project/application/configs/project.ini
===================================================================
--- tags/1.5.1/new_project/application/configs/project.ini	2012-02-16 11:00:36 UTC (rev 492)
+++ tags/1.5.1/new_project/application/configs/project.ini	2012-02-16 11:09:51 UTC (rev 493)
@@ -172,7 +172,7 @@
 layoutPrepare.title                 = 1
 layoutPrepare.projectName           = header
 layoutPrepare.login                 = header_bar
-layoutPrepare.contact               = header_bar
+layoutPrepare.contact               = 0
 layoutPrepare.localeSet             = header_bar
 layoutPrepare.organizationSwitcher  = header_bar
 layoutPrepare.version               = footer
@@ -187,7 +187,7 @@
 layoutPrepare.jQuery                = 1
 
 layoutPrepare.login.class         = rightFloat
-layoutPrepareArgs.contact.class   = rightFloat
+;layoutPrepareArgs.contact.class   = rightFloat
 layoutPrepareArgs.time.class      = rightFloat
 layoutPrepareArgs.user.class      = rightFloat
 layoutPrepareArgs.version.class   = leftFloat

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