Changeset 3011
- Timestamp:
- 12/11/06 10:49:25 (2 years ago)
- Files:
-
- trunk/lib/generator/sfAdminGenerator.class.php (modified) (1 diff)
- trunk/lib/generator/sfCrudGenerator.class.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/generator/sfAdminGenerator.class.php
r2971 r3011 466 466 else if ($type == CreoleTypes::DATE || $type == CreoleTypes::TIMESTAMP) 467 467 { 468 $format = isset($params['date_format']) ? $params['date_format'] : 'f';468 $format = isset($params['date_format']) ? $params['date_format'] : ($type == CreoleTypes::DATE ? 'D' : 'f'); 469 469 return "($columnGetter !== null && $columnGetter !== '') ? format_date($columnGetter, \"$format\") : ''"; 470 470 } trunk/lib/generator/sfCrudGenerator.class.php
r2848 r3011 235 235 $columnGetter = $this->getColumnGetter($column, true); 236 236 237 if ($type == CreoleTypes:: DATE || $type == CreoleTypes::TIMESTAMP)237 if ($type == CreoleTypes::TIMESTAMP) 238 238 { 239 239 return "format_date($columnGetter, 'f')"; 240 } 241 elseif ($type == CreoleTypes::DATE) 242 { 243 return "format_date($columnGetter, 'D')"; 240 244 } 241 245 else