[Gemstracker-svn] SF.net SVN: gemstracker:[309] branches/userloader/classes/Gems

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

Revision: 309
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=309&view=rev
Author:   mennodekker
Date:     2011-11-29 10:33:49 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Added description to survey_id dropdown in round editor

Modified Paths:
--------------
    branches/userloader/classes/Gems/Tracker/Engine/TrackEngineAbstract.php
    branches/userloader/classes/Gems/Util/TrackData.php

Modified: branches/userloader/classes/Gems/Tracker/Engine/TrackEngineAbstract.php
===================================================================
--- branches/userloader/classes/Gems/Tracker/Engine/TrackEngineAbstract.php	2011-11-29 08:34:05 UTC (rev 308)
+++ branches/userloader/classes/Gems/Tracker/Engine/TrackEngineAbstract.php	2011-11-29 10:33:49 UTC (rev 309)
@@ -702,7 +702,7 @@
             $model->set('gro_id_track',  'label', $this->_('Track'), 'elementClass', 'exhibitor', 'multiOptions', MUtil_Lazy::call($this->util->getTrackData()->getAllTracks));
         }
 
-        $model->set('gro_id_survey',         'label', $this->_('Survey'),       'multiOptions', $this->util->getTrackData()->getAllSurveys());
+        $model->set('gro_id_survey',         'label', $this->_('Survey'),       'multiOptions', $this->util->getTrackData()->getAllSurveysAndDescriptions());
         $model->set('gro_id_order',          'label', $this->_('Order'),        'default', 10, 'validators[]', $model->createUniqueValidator(array('gro_id_order', 'gro_id_track')));
         $model->set('gro_round_description', 'label', $this->_('Description'),  'size', '30'); //, 'minlength', 4, 'required', true);
         $model->set('gro_changed_event',     'label', $this->_('After change'), 'multiOptions', $this->events->listRoundChangedEvents());

Modified: branches/userloader/classes/Gems/Util/TrackData.php
===================================================================
--- branches/userloader/classes/Gems/Util/TrackData.php	2011-11-29 08:34:05 UTC (rev 308)
+++ branches/userloader/classes/Gems/Util/TrackData.php	2011-11-29 10:33:49 UTC (rev 309)
@@ -95,6 +95,13 @@
         return $surveys;
     } // */
 
+
+    /**
+     * Retrieve an array of key/value pairs for gsu_id_survey and gsu_survey_name
+     *
+     * @staticvar array $surveys
+     * @return array
+     */
     public function getAllSurveys()
     {
         static $surveys;
@@ -107,6 +114,23 @@
     }
 
     /**
+     * Retrieve an array of key/value pairs for gsu_id_survey and gsu_survey_name plus gsu_survey_description
+     *
+     * @staticvar array $surveys
+     * @return array
+     */
+    public function getAllSurveysAndDescriptions()
+    {
+        static $surveys;
+
+        if (! $surveys) {
+            $surveys = $this->db->fetchPairs('SELECT gsu_id_survey, LEFT(CONCAT_WS(" - ", gsu_survey_name, gsu_survey_description),50) FROM gems__surveys ORDER BY gsu_survey_name');
+        }
+
+        return $surveys;
+    }
+
+    /**
      * Returns array (id => name) of all tracks, sorted alphabetically
      * @return array
      */

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