Changeset 8964

Timestamp:

05/14/08 22:14:44 (2 months ago)

Author:

dwhittle

Message:

dwhittle: merged changes to branch

Files:

• branches/dwhittle/1.0/CHANGELOG (modified) (2 diffs)
• branches/dwhittle/1.0/lib/VERSION (modified) (1 diff)
• branches/dwhittle/1.1/lib/task/generator/sfGenerateTaskTask.class.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/widget/sfWidgetFormSchema.class.php (modified) (3 diffs)
• branches/dwhittle/1.1/test/unit/widget/sfWidgetFormSchemaTest.php (modified) (2 diffs)

branches/dwhittle/1.0/CHANGELOG

@@ -1 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Version 1.0.14
@@ -9 +29 @@
-This is a bug fix release.
-
- 
+
-* r8754: validation yml with fillin is used even without other validators defined in the file. (closes #3232)
-* r8720: fixed url validation bug by applied carls patch (1.1 backport). (closes #1373)
-* r8718: Add support for "paramName" option to _auto_complete_field() function (closes #2345)
- 
+
-* r8709: fillin now handles array notations like <input type="text" name "textinput[]"/> correctly. (closes #2811)
-* r8707: fixed ajax response fillin, which does not include a doctype because it is returned without layout. (closes #1687)
-* r8699: added compat options to propel database  (fixes #3364)
-* r8695: made sfFillInForm work with checkbox arrays as well like checkbox_many[]. (closes #1776, #3399)
- 
+
-* r8651: corrected checking for Eaccelerator in sfProcessCache. (closes #3425)
-* r8445: fixed web debug toolbar in safari (closes #3328, #1673)

branches/dwhittle/1.0/lib/VERSION

@@ -1 @@
-5
+7

branches/dwhittle/1.1/lib/task/generator/sfGenerateTaskTask.class.php

@@ -65 +65 @@
-
-    // Validate the class name
-app
+taskClassName
-    {
-app
+taskClassName
-    }
-

branches/dwhittle/1.1/lib/widget/sfWidgetFormSchema.class.php

@@ -26 +26 @@
-    BEFORE = 'before',
-    AFTER  = 'after';
+  
+  protected static
+    $defaultFormatterName = 'table';
-
-  protected
@@ -63 +66 @@
-
-    $this->addOption('name_format', '%s');
-'table'
+self::$defaultFormatterName
-
-    parent::__construct($options, $attributes);
@@ -99 +102 @@
-  {
-    return $this->formFormatters;
+  }
+  
+  /**
+   * Sets the generic default formatter name used by the class. If you want all 
+   * of your forms to be generated with the <code>list</code> format, you can 
+   * do it in a project or application configuration class:
+   * 
+   * <pre>
+   * class ProjectConfiguration extends sfProjectConfiguration
+   * {
+   *   public function setup()
+   *   {
+   *     sfWidgetFormSchema::setDefaultFormFormatterName('list');
+   *   }
+   * }
+   * </pre>  
+   *
+   * @param string $name
+   */
+  static public function setDefaultFormFormatterName($name)
+  {
+    self::$defaultFormatterName = $name;
-  }
-

branches/dwhittle/1.1/test/unit/widget/sfWidgetFormSchemaTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-7
+9
-
-$w1 = new sfWidgetFormInput(array(), array('class' => 'foo1'));
@@ -332 +332 @@
-  $t->ok($widget == $f[$name], '__clone() clones embedded widgets');
-}
+
+// setDefaultFormFormatterName()
+$t->diag('setDefaultFormFormatterName()');
+$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
+$t->isa_ok($w->getFormFormatter(), 'sfWidgetFormSchemaFormatterTable', 'setDefaultFormFormatterName() has the "sfWidgetFormSchemaFormatterTable" form formatter by default');
+
+sfWidgetFormSchema::setDefaultFormFormatterName('list');
+$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
+$t->isa_ok($w->getFormFormatter(), 'sfWidgetFormSchemaFormatterList', 'setDefaultFormFormatterName() changes the default form formatter name correctly');