gemstracker-svn

[Gemstracker-svn] SF.net SVN: gemstracker:[174] trunk/library/classes/Gems/Model/ RespondentModel.php

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

Revision: 174
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=174&view=rev
Author:   matijsdejong
Date:     2011-11-03 17:40:33 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
When searching on a hashed SSN for #37 the hash should be applied to the search value automatically.

Modified Paths:
--------------
    trunk/library/classes/Gems/Model/RespondentModel.php

Modified: trunk/library/classes/Gems/Model/RespondentModel.php
===================================================================
--- trunk/library/classes/Gems/Model/RespondentModel.php	2011-11-03 13:37:18 UTC (rev 173)
+++ trunk/library/classes/Gems/Model/RespondentModel.php	2011-11-03 17:40:33 UTC (rev 174)
@@ -107,10 +107,30 @@
             $filter['gr2o_id_organization'] = $this->getCurrentOrganization();
         }
 
+        if (self::SSN_HASH === $this->hashSsn) {
+            // Make sure a search for a SSN is hashed when needed.
+            array_walk_recursive($filter, array($this, 'applyHash'));
+        }
+
         return $filter;
     }
 
     /**
+     * Apply hash function for array_walk_recursive in _checkFilterUsed()
+     *
+     * @see _checkFilterUsed()
+     *
+     * @param string $filterValue
+     * @param string $filterKey
+     */
+    public function applyHash(&$filterValue, $filterKey)
+    {
+        if ('grs_ssn' === $filterKey) {
+            $filterValue = $this->project->getValueHash($filterValue);
+        }
+    }
+
+    /**
      * Return a hashed version of the input value.
      *
      * @param string $name Optional name, is here for ModelAbstract setOnSave compatibility

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

[Gemstracker-svn] SF.net SVN: gemstracker:[1177] trunk/library/classes/Gems/Model/ RespondentModel.php

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

Revision: 1177
          http://sourceforge.net/p/gemstracker/code/1177
Author:   matijsdejong
Date:     2013-03-13 16:12:06 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
Display fix

Modified Paths:
--------------
    trunk/library/classes/Gems/Model/RespondentModel.php

Modified: trunk/library/classes/Gems/Model/RespondentModel.php
===================================================================
--- trunk/library/classes/Gems/Model/RespondentModel.php	2013-03-13 15:50:28 UTC (rev 1176)
+++ trunk/library/classes/Gems/Model/RespondentModel.php	2013-03-13 16:12:06 UTC (rev 1177)
@@ -224,18 +224,18 @@
 
         $this->resetOrder();
         if ($this->has('gr2o_id_organization')) {
+            $user = $this->loader->getCurrentUser();
+
             $this->set('gr2o_id_organization',
                     'label', $translator->_('Organization'),
-                    'tab', $translator->_('Identification')
+                    'tab', $translator->_('Identification'),
+                    'multiOptions', $user->getRespondentOrganizations()
                     );
 
-            if ($this->isMultiOrganization()) {
-                $user = $this->loader->getCurrentUser();
+            $this->set('gr2o_id_organization', 'default', $user->getCurrentOrganizationId());
 
-                $this->set('gr2o_id_organization',
-                        'default', $user->getCurrentOrganizationId(),
-                        'multiOptions', $user->getRespondentOrganizations()
-                        );
+            if (count($user->getAllowedOrganizations()) == 1) {
+                $this->set('gr2o_id_organization', 'elementClass', 'Exhibitor');
             }
         }
 

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