Development

Changeset 3011

You must first sign up to be able to contribute.

Changeset 3011

Show
Ignore:
Timestamp:
12/11/06 10:49:25 (2 years ago)
Author:
chtito
Message:

differentiating between TIMESTAMP and DATE formats

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lib/generator/sfAdminGenerator.class.php

    r2971 r3011  
    466466    else if ($type == CreoleTypes::DATE || $type == CreoleTypes::TIMESTAMP) 
    467467    { 
    468       $format = isset($params['date_format']) ? $params['date_format'] : 'f'
     468      $format = isset($params['date_format']) ? $params['date_format'] : ($type == CreoleTypes::DATE ? 'D' : 'f')
    469469      return "($columnGetter !== null && $columnGetter !== '') ? format_date($columnGetter, \"$format\") : ''"; 
    470470    } 
  • trunk/lib/generator/sfCrudGenerator.class.php

    r2848 r3011  
    235235    $columnGetter = $this->getColumnGetter($column, true); 
    236236 
    237     if ($type == CreoleTypes::DATE || $type == CreoleTypes::TIMESTAMP) 
     237    if ($type == CreoleTypes::TIMESTAMP) 
    238238    { 
    239239      return "format_date($columnGetter, 'f')"; 
     240    } 
     241    elseif ($type == CreoleTypes::DATE) 
     242    { 
     243      return "format_date($columnGetter, 'D')"; 
    240244    } 
    241245    else