Changeset 911

Timestamp:

02/27/06 15:58:56 (7 years ago)

Author:

fabien

Message:

added params to list and filters + changed order of include_* for options_for_select

Files:

• trunk/lib/generator/sfPropelAdminGenerator.class.php (modified) (2 diffs)
• trunk/lib/helper/FormHelper.php (modified) (1 diff)
• trunk/lib/helper/ObjectHelper.php (modified) (2 diffs)

trunk/lib/generator/sfPropelAdminGenerator.class.php

@@ -455 +455 @@
-  public function getColumnListTag($column, $params = array())
-  {
+    $user_params = $this->getParameterValue('list.fields.'.$column->getName().'.params');
+    $user_params = is_array($user_params) ? $user_params : sfToolkit::stringToArray($user_params);
+    $params      = $user_params ? array_merge($params, $user_params) : $params;
+
-    $type = $column->getCreoleType();
-
-    if ($type == CreoleTypes::DATE || $type == CreoleTypes::TIMESTAMP)
-    {
-
+
+
-    }
-    elseif ($type == CreoleTypes::BOOLEAN)
@@ -473 +478 @@
-  public function getColumnFilterTag($column, $params = array())
-  {
+    $user_params = $this->getParameterValue('list.fields.'.$column->getName().'.params');
+    $user_params = is_array($user_params) ? $user_params : sfToolkit::stringToArray($user_params);
+    $params      = $user_params ? array_merge($params, $user_params) : $params;
+
-    $type = $column->getCreoleType();
-

trunk/lib/helper/FormHelper.php

@@ -56 +56 @@
-  $html = '';
-
-
+
+
+
+
+
-  {
-    $html .= content_tag('option', '', array('value' => ''))."\n";
-  }
-  else if (isset($html_options['include_custom']))
-  {
-    $html .= content_tag('option', $html_options['include_custom'], array('value' => ''))."\n";
-  }
-

trunk/lib/helper/ObjectHelper.php

@@ -118 +118 @@
-  $select_options = _get_values_for_object_select_tag($object, $related_class);
-
-
+
+
+
+
+
+
-  {
-    array_unshift($select_options, '-- '._convert_method_to_name($method, $options).' --');
@@ -127 +132 @@
-    array_unshift($select_options, '');
-    unset($options['include_blank']);
-  }
-  else if (isset($options['include_custom']))
-  {
-    array_unshift($select_options, $options['include_custom']);
-    unset($options['include_custom']);
-  }
-