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

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

Revision: 571
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=571&view=rev
Author:   michieltcs
Date:     2012-03-28 19:38:24 +0000 (Wed, 28 Mar 2012)
Log Message:
-----------
Uncomment/fix/use getActiveSurveys()

Modified Paths:
--------------
    trunk/library/classes/Gems/Tracker/Snippets/EditRoundSnippetAbstract.php
    trunk/library/classes/Gems/Util/TrackData.php

Modified: trunk/library/classes/Gems/Tracker/Snippets/EditRoundSnippetAbstract.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/EditRoundSnippetAbstract.php	2012-03-28 12:15:34 UTC (rev 570)
+++ trunk/library/classes/Gems/Tracker/Snippets/EditRoundSnippetAbstract.php	2012-03-28 19:38:24 UTC (rev 571)
@@ -182,7 +182,7 @@
         }
 
         // Check the survey name
-        $surveys = $this->util->getTrackData()->getAllSurveys();
+        $surveys = $this->util->getTrackData()->getActiveSurveys();
         if (isset($surveys[$this->formData['gro_id_survey']])) {
             $this->formData['gro_survey_name'] = $surveys[$this->formData['gro_id_survey']];
         } else {

Modified: trunk/library/classes/Gems/Util/TrackData.php
===================================================================
--- trunk/library/classes/Gems/Util/TrackData.php	2012-03-28 12:15:34 UTC (rev 570)
+++ trunk/library/classes/Gems/Util/TrackData.php	2012-03-28 19:38:24 UTC (rev 571)
@@ -82,20 +82,24 @@
         return $dates;
     } // */
 
-    /*
+    /**
+     * 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 getActiveSurveys()
     {
-        static $surveys;
+        static $activeSurveys;
 
-        if (! $surveys) {
-            $surveys = $this->util->getTranslated()->getEmptyDropdownArray();
-            $surveys = $surveys + $this->db->fetchPairs('SELECT gsu_id_survey, gsu_survey_name FROM gems__surveys WHERE gsu_active = 1 AND gsu_surveyor_active = 1 ORDER BY gsu_survey_name');
+        if (! $activeSurveys) {
+            $activeSurveys = $this->db->fetchPairs('SELECT gsu_id_survey, gsu_survey_name FROM gems__surveys WHERE gsu_active = 1 AND gsu_surveyor_active = 1 ORDER BY gsu_survey_name');
         }
 
-        return $surveys;
-    } // */
+        return $activeSurveys;
+    }
 
-
     /**
      * Retrieve an array of key/value pairs for gsu_id_survey and gsu_survey_name
      *

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