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

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

Revision: 793
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=793&view=rev
Author:   mennodekker
Date:     2012-06-28 08:46:02 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
Made mutli-org a little safer
Updated respondentexport to work with new model
Slider values applied to logaction
Optimised tableform a little

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/LogAction.php
    trunk/library/classes/Gems/Export/RespondentExport.php
    trunk/library/classes/Gems/Form/TableForm.php
    trunk/library/classes/Gems/Model/RespondentModel.php

Modified: trunk/library/classes/Gems/Default/LogAction.php
===================================================================
--- trunk/library/classes/Gems/Default/LogAction.php	2012-06-27 11:59:17 UTC (rev 792)
+++ trunk/library/classes/Gems/Default/LogAction.php	2012-06-28 08:46:02 UTC (rev 793)
@@ -71,8 +71,8 @@
         }
 
         // Create date range elements
-        $min  = -91;
-        $max  = 91;
+        $min  = $this->minPeriod;
+        $max  = $this->maxPeriod;
         $size = max(strlen($min), strlen($max));
 
         $element = new Zend_Form_Element_Text('period_start', array('label' => $this->_('from'), 'size' => $size - 1, 'maxlength' => $size, 'class' => 'rightAlign'));

Modified: trunk/library/classes/Gems/Export/RespondentExport.php
===================================================================
--- trunk/library/classes/Gems/Export/RespondentExport.php	2012-06-27 11:59:17 UTC (rev 792)
+++ trunk/library/classes/Gems/Export/RespondentExport.php	2012-06-28 08:46:02 UTC (rev 793)
@@ -285,7 +285,9 @@
     protected function _exportRespondent($respondentId)
     {
         $respondentModel = $this->loader->getModels()->getRespondentModel(false);
-        $respondentModel->setFilter(array('gr2o_patient_nr' => $respondentId));
+        //Insert orgId when set
+        $respondentModel->applyRequest(Zend_Controller_Front::getInstance()->getRequest());
+        $respondentModel->addFilter(array('gr2o_patient_nr' => $respondentId));
         $respondentData = $respondentModel->loadFirst();
 
         $this->html->snippet($this->_respondentSnippet,

Modified: trunk/library/classes/Gems/Form/TableForm.php
===================================================================
--- trunk/library/classes/Gems/Form/TableForm.php	2012-06-27 11:59:17 UTC (rev 792)
+++ trunk/library/classes/Gems/Form/TableForm.php	2012-06-28 08:46:02 UTC (rev 793)
@@ -65,24 +65,16 @@
      * @return null|Zend_Form_Decorator_Abstract
      */
     private function _getImportantDecorator($element) {
-        $dec1 = null;
+        $class = get_class($element);
 
-        if ($dec1 = $element->getDecorator('ViewHelper')) {
-            return $dec1;
-        } elseif ($dec1 = $element->getDecorator('UiWidgetElement')) {
-            return $dec1;
-        } elseif ($dec1 = $element->getDecorator('File')) {
-            return $dec1;
-        } else {
-            $decorators = $element->getDecorators();
-            foreach($decorators as $name=>$decorator) {
-                if (substr($name, 0, 5) == 'ZendX') {
-                    $dec1 = $decorator;
-                    break;
-                }
-            }
-            return $dec1;
+        if (strpos($class, 'JQuery')) {
+            return $element->getDecorator('UiWidgetElement');
         }
+        if (strpos($class, 'File')) {
+            return $element->getDecorator('File');
+        }
+
+        return $element->getDecorator('ViewHelper');
     }
 
     /**
@@ -225,7 +217,7 @@
         if ($this->loadDefaultDecoratorsIsDisabled()) {
             return $this;
         }
-        
+
         $class = $this->getAttrib('class');
         if (empty($class)) {
             $class = 'formTable';
@@ -256,7 +248,7 @@
                 }
             }
         }
-        
+
         return parent::setView($view);
     }
 }
\ No newline at end of file

Modified: trunk/library/classes/Gems/Model/RespondentModel.php
===================================================================
--- trunk/library/classes/Gems/Model/RespondentModel.php	2012-06-27 11:59:17 UTC (rev 792)
+++ trunk/library/classes/Gems/Model/RespondentModel.php	2012-06-28 08:46:02 UTC (rev 793)
@@ -104,9 +104,11 @@
         $filter = parent::_checkFilterUsed($filter);
 
         if (! isset($filter['gr2o_id_organization'])) {
-            if ($this->isMultiOrganization()) {
+            if ($this->isMultiOrganization() && !isset($filter['gr2o_patient_nr'])) {
+                // If we are not looking for a specific patient, we can look at all patients
                 $filter[] = 'gr2o_id_organization IN (' . implode(', ', array_keys($this->user->getAllowedOrganizations())) . ')';
             } else {
+                // Otherwise, we can only see in our current organization
                 $filter['gr2o_id_organization'] = $this->getCurrentOrganization();
             }
         }

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