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

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

Revision: 572
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=572&view=rev
Author:   michieltcs
Date:     2012-03-28 19:45:36 +0000 (Wed, 28 Mar 2012)
Log Message:
-----------
Also add getActiveSurveysAndDescriptions()

Modified Paths:
--------------
    trunk/library/classes/Gems/Tracker/Engine/TrackEngineAbstract.php
    trunk/library/classes/Gems/Util/TrackData.php

Modified: trunk/library/classes/Gems/Tracker/Engine/TrackEngineAbstract.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Engine/TrackEngineAbstract.php	2012-03-28 19:38:24 UTC (rev 571)
+++ trunk/library/classes/Gems/Tracker/Engine/TrackEngineAbstract.php	2012-03-28 19:45:36 UTC (rev 572)
@@ -733,7 +733,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()->getAllSurveysAndDescriptions());
+        $model->set('gro_id_survey',         'label', $this->_('Survey'),       'multiOptions', $this->util->getTrackData()->getActiveSurveysAndDescriptions());
         $model->set('gro_icon_file',         'label', $this->_('Icon'));
         $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);

Modified: trunk/library/classes/Gems/Util/TrackData.php
===================================================================
--- trunk/library/classes/Gems/Util/TrackData.php	2012-03-28 19:38:24 UTC (rev 571)
+++ trunk/library/classes/Gems/Util/TrackData.php	2012-03-28 19:45:36 UTC (rev 572)
@@ -102,7 +102,25 @@
 
     /**
      * Retrieve an array of key/value pairs for gsu_id_survey and gsu_survey_name
+     * only the active surveys
      *
+     * @staticvar array $activeSurveys
+     * @return array
+     */
+    public function getActiveSurveysAndDescriptions()
+    {
+        static $activeSurveys;
+
+        if (! $activeSurveys) {
+            $activeSurveys = $this->db->fetchPairs('SELECT gsu_id_survey, LEFT(CONCAT_WS(" - ", gsu_survey_name, gsu_survey_description),50) FROM gems__surveys WHERE gsu_active = 1 AND gsu_surveyor_active = 1 ORDER BY gsu_survey_name');
+        }
+
+        return $activeSurveys;
+    }
+
+    /**
+     * Retrieve an array of key/value pairs for gsu_id_survey and gsu_survey_name
+     *
      * @staticvar array $surveys
      * @return array
      */

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