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

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

Revision: 133
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=133&view=rev
Author:   matijsdejong
Date:     2011-10-24 12:06:15 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Fix for difference between active staff and staff members who ever did something.

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/MailJobAction.php
    trunk/library/classes/Gems/Util/DbLookup.php

Modified: trunk/library/classes/Gems/Default/MailJobAction.php
===================================================================
--- trunk/library/classes/Gems/Default/MailJobAction.php	2011-10-24 11:58:01 UTC (rev 132)
+++ trunk/library/classes/Gems/Default/MailJobAction.php	2011-10-24 12:06:15 UTC (rev 133)
@@ -100,7 +100,7 @@
 
         $model->set('gmj_id_message',      'label', $this->_('Template'), 'multiOptions', $unselected + $dbLookup->getMailTemplates());
         $model->set('gmj_id_user_as',      'label', $this->_('By staff member'),
-                'multiOptions', $unselected + $dbLookup->getStaff(), 'default', $this->escort->getCurrentUserId(),
+                'multiOptions', $unselected + $dbLookup->getActiveStaff(), 'default', $this->escort->getCurrentUserId(),
                 'description', $this->_('Used for logging and possibly from address.'));
         $model->set('gmj_active',          'label', $this->_('Active'),
                 'multiOptions', $translated->getYesNo(), 'elementClass', 'Checkbox', 'required', true,

Modified: trunk/library/classes/Gems/Util/DbLookup.php
===================================================================
--- trunk/library/classes/Gems/Util/DbLookup.php	2011-10-24 11:58:01 UTC (rev 132)
+++ trunk/library/classes/Gems/Util/DbLookup.php	2011-10-24 12:06:15 UTC (rev 133)
@@ -93,6 +93,24 @@
         return $organizations;
     }
 
+    /**
+     * Return key/value pairs of all active staff members
+     *
+     * @staticvar array $data
+     * @return array
+     */
+    public function getActiveStaff()
+    {
+        static $data;
+
+        if (! $data) {
+            $data = $this->db->fetchPairs("SELECT gsf_id_user, CONCAT(COALESCE(gsf_last_name, '-'), ', ', COALESCE(gsf_first_name, ''), COALESCE(CONCAT(' ', gsf_surname_prefix), ''))
+                    FROM gems__staff WHERE gsf_active = 1 ORDER BY gsf_last_name, gsf_first_name, gsf_surname_prefix");
+        }
+
+        return $data;
+    }
+
     public function getActiveStaffGroups()
     {
         static $groups;
@@ -214,7 +232,7 @@
     }
 
     /**
-     * Return key/value pairs of all active staff members
+     * Return key/value pairs of all staff members, currently active or not
      *
      * @staticvar array $data
      * @return array
@@ -225,7 +243,7 @@
 
         if (! $data) {
             $data = $this->db->fetchPairs("SELECT gsf_id_user, CONCAT(COALESCE(gsf_last_name, '-'), ', ', COALESCE(gsf_first_name, ''), COALESCE(CONCAT(' ', gsf_surname_prefix), ''))
-                    FROM gems__staff WHERE gsf_active = 1 ORDER BY gsf_last_name, gsf_first_name, gsf_surname_prefix");
+                    FROM gems__staff WHERE ORDER BY gsf_last_name, gsf_first_name, gsf_surname_prefix");
         }
 
         return $data;

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