Changeset 11173

Timestamp:

08/26/08 22:41:28 (5 years ago)

Author:

dwhittle

Message:

1.2: removed creole dependencies

Files:

• branches/1.2/lib/generator/sfAdminGenerator.class.php (modified) (9 diffs)
• branches/1.2/lib/generator/sfCrudGenerator.class.php (modified) (3 diffs)
• branches/1.2/lib/i18n/sfMessageSource.class.php (modified) (1 diff)

branches/1.2/lib/generator/sfAdminGenerator.class.php

@@ -283 +283 @@
-
-    // default parameter values
-Creole
-Creole
+
+PropelColumn
-    {
-      $params = array_merge(array('rich' => true, 'calendar_button_img' => sfConfig::get('sf_admin_web_dir').'/images/date.png'), $params);
-    }
-Creole
+PropelColumn
-    {
-      $params = array_merge(array('rich' => true, 'withtime' => true, 'calendar_button_img' => sfConfig::get('sf_admin_web_dir').'/images/date.png'), $params);
@@ -600 +600 @@
-    $params      = $user_params ? array_merge($params, $user_params) : $params;
-
-Creole
+
-    
-    $columnGetter = $this->getColumnGetter($column, true);
@@ -612 +612 @@
-      return "get_partial('".$column->getName()."', array('type' => 'list', '{$this->getSingularName()}' => \${$this->getSingularName()}))";
-    }
-CreoleTypes::DATE || $type == Creole
-
-Creole
+PropelColumnTypes::DATE || $type == PropelColumn
+
+PropelColumn
-      return "($columnGetter !== null && $columnGetter !== '') ? format_date($columnGetter, \"$format\") : ''";
-    }
-Creole
+PropelColumn
-    {
-      return "$columnGetter ? image_tag(sfConfig::get('sf_admin_web_dir').'/images/tick.png') : ' '";
@@ -650 +650 @@
-    }
-
-Creole
+
-
-    $default_value = "isset(\$filters['".$column->getName()."']) ? \$filters['".$column->getName()."'] : null";
@@ -662 +662 @@
-
-    }
-Creole
+PropelColumn
-    {
-      // rich=false not yet implemented
@@ -668 +668 @@
-      return "input_date_range_tag($name, $default_value, $params)";
-    }
-Creole
+PropelColumn
-    {
-      // rich=false not yet implemented
@@ -674 +674 @@
-      return "input_date_range_tag($name, $default_value, $params)";
-    }
-Creole
+PropelColumn
-    {
-      $defaultIncludeCustom = '__("yes or no")';
@@ -688 +688 @@
-      return "select_tag($name, $options, $params)";
-    }
-CreoleTypes::CHAR || $type == CreoleTypes::VARCHAR || $type == CreoleTypes::TEXT || $type == Creole
+PropelColumnTypes::CHAR || $type == PropelColumnTypes::VARCHAR || $type == PropelColumn
-    {
-      $size = ($column->getSize() < 15 ? $column->getSize() : 15);
@@ -694 +694 @@
-      return "input_tag($name, $default_value, $params)";
-    }
-CreoleTypes::INTEGER || $type == CreoleTypes::TINYINT || $type == CreoleTypes::SMALLINT || $type == Creole
+PropelColumnTypes::INTEGER || $type == PropelColumnTypes::TINYINT || $type == PropelColumnTypes::SMALLINT || $type == PropelColumn
-    {
-      $params = $this->getObjectTagParams($params, array('size' => 7));
-      return "input_tag($name, $default_value, $params)";
-    }
-CreoleTypes::FLOAT || $type == CreoleTypes::DOUBLE || $type == CreoleTypes::DECIMAL || $type == CreoleTypes::NUMERIC || $type == Creole
+PropelColumnTypes::FLOAT || $type == PropelColumnTypes::DOUBLE || $type == PropelColumnTypes::DECIMAL || $type == PropelColumnTypes::NUMERIC || $type == PropelColumn
-    {
-      $params = $this->getObjectTagParams($params, array('size' => 7));

branches/1.2/lib/generator/sfCrudGenerator.class.php

@@ -328 +328 @@
-  public function getColumnListTag($column, $params = array())
-  {
-Creole
+
-    
-    $columnGetter = $this->getColumnGetter($column, true);
-
-Creole
+PropelColumn
-    {
-      return "format_date($columnGetter, 'f')";
-    }
-Creole
+PropelColumn
-    {
-      return "format_date($columnGetter, 'D')";
@@ -356 +356 @@
-  public function getCrudColumnEditTag($column, $params = array())
-  {
-Creole
+
-
-    if ($column->isForeignKey())
@@ -367 +367 @@
-      return $this->getPHPObjectHelper('select_tag', $column, $params, array('related_class' => $this->getRelatedClassName($column)));
-    }
-Creole
+PropelColumn
-    {
-      // rich=false not yet implemented
-      return $this->getPHPObjectHelper('input_date_tag', $column, $params, array('rich' => true));
-    }
-Creole
+PropelColumn
-    {
-      // rich=false not yet implemented
-      return $this->getPHPObjectHelper('input_date_tag', $column, $params, array('rich' => true, 'withtime' => true));
-    }
-Creole
+PropelColumn
-    {
-      return $this->getPHPObjectHelper('checkbox_tag', $column, $params);
-    }
-CreoleTypes::CHAR || $type == Creole
+PropelColumnTypes::CHAR || $type == PropelColumn
-    {
-      $size = ($column->getSize() > 20 ? ($column->getSize() < 80 ? $column->getSize() : 80) : 20);
-      return $this->getPHPObjectHelper('input_tag', $column, $params, array('size' => $size));
-    }
-CreoleTypes::INTEGER || $type == CreoleTypes::TINYINT || $type == CreoleTypes::SMALLINT || $type == Creole
+PropelColumnTypes::INTEGER || $type == PropelColumnTypes::TINYINT || $type == PropelColumnTypes::SMALLINT || $type == PropelColumn
-    {
-      return $this->getPHPObjectHelper('input_tag', $column, $params, array('size' => 7));
-    }
-CreoleTypes::FLOAT || $type == CreoleTypes::DOUBLE || $type == CreoleTypes::DECIMAL || $type == CreoleTypes::NUMERIC || $type == Creole
+PropelColumnTypes::FLOAT || $type == PropelColumnTypes::DOUBLE || $type == PropelColumnTypes::DECIMAL || $type == PropelColumnTypes::NUMERIC || $type == PropelColumn
-    {
-      return $this->getPHPObjectHelper('input_tag', $column, $params, array('size' => 7));
-    }
-CreoleTypes::TEXT || $type == Creole
+PropelColumn
-    {
-      return $this->getPHPObjectHelper('textarea_tag', $column, $params, array('size' => '30x3'));

branches/1.2/lib/i18n/sfMessageSource.class.php

@@ -102 +102 @@
-   * Factory method to instantiate a new sfMessageSource depending on the
-   * source type. The built-in source types are 'XLIFF', 'SQLite',
-'Creole' 
+
-   * The source parameter is dependent on the source type.
-   * For 'gettext' and 'XLIFF', it should point to the directory