Changeset 1206

Timestamp:

11/01/06 19:34:55 (2 years ago)

Author:

david

Message:

FPF: fixed population of multi-selects and fixed a situation where a fatal error could occur when populating multiple forms

Files:

• trunk/src/filter/AgaviFormPopulationFilter.class.php (modified) (3 diffs)

trunk/src/filter/AgaviFormPopulationFilter.class.php

@@ -190 +190 @@
         $p = $populate;
       } else {
-        $p = $populate[$form->getAttribute('id')];
+        if(isset($populate[$form->getAttribute('id')]) && (($p = $populate[$form->getAttribute('id')]) instanceof AgaviParameterHolder)) {
+          $p = $populate[$form->getAttribute('id')];
+        } else {
+          continue;
+        }
       }
       
@@ -218 +222 @@
           $pname = $matches[1][0];
           
-          for($i = 0; $i < count($matches[2]); $i++) {
+          if($element->nodeName == 'select' && $multiple = $element->hasAttribute('multiple')) {
+            $count = count($matches[2]) - 1;
+          } else {
+            $count = count($matches[2]);
+          }
+          for($i = 0; $i < $count; $i++) {
             $val = $matches[2][$i];
             if((string)$matches[2][$i] === (string)(int)$matches[2][$i]) {
@@ -338 +347 @@
           
         } elseif($element->nodeName == 'select') {
-          $multiple = $element->hasAttribute('multiple');
           // select elements
           // yes, we still use XPath because there could be OPTGROUPs
           foreach($xpath->query('descendant::' . $ns . 'option', $element) as $option) {
             $option->removeAttribute('selected');
-            if($p->hasParameter($pname) && ($option->getAttribute('value') == $value || ($multiple && is_array($value) && in_array($option->getAttribute('value'), $value)))) {
+            if($p->hasParameter($pname) && ($option->getAttribute('value') === $value || ($multiple && is_array($value) && in_array($option->getAttribute('value'), $value)))) {
               $option->setAttribute('selected', 'selected');
             }