Development

Changeset 10087

You must first sign up to be able to contribute.

Changeset 10087

Show
Ignore:
Timestamp:
07/03/08 15:02:51 (5 months ago)
Author:
Leon.van.der.Ree
Message:

some extra fixes, next thing, take a good look at action.class.php
Problem is caused by $column->getName() which returns the relative name from now on (same as key), maybe rethink this as well

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/actions/actions.class.php

    r9936 r10087  
    714714 
    715715<?php if ($this->getParameterValue('list.filters')): ?> 
    716 <?php foreach ($this->getColumns('list.filters') as $column): $type = $column->getCreoleType() ?> 
     716<?php foreach ($this->getColumns('list.filters') as $column):  
     717    $type = $column->getCreoleType(); 
     718 
     719    $last = strrpos($column->key, '/'); 
     720    $cname = substr($column->key, $last + 1); 
     721?> 
    717722<?php if ($type == CreoleTypes::DATE || $type == CreoleTypes::TIMESTAMP): //TODO replace $column->getName with $columnName ?> 
    718       if (isset($filters['<?php echo $column->getName() ?>']['from']) && $filters['<?php echo $column->getName() ?>']['from'] !== '') 
    719       { 
    720         $filters['<?php echo $column->getName() ?>']['from'] = sfI18N::getTimestampForCulture($filters['<?php echo $column->getName() ?>']['from'], $this->getUser()->getCulture()); 
    721       } 
    722       if (isset($filters['<?php echo $column->getName() ?>']['to']) && $filters['<?php echo $column->getName() ?>']['to'] !== '') 
    723       { 
    724         $filters['<?php echo $column->getName() ?>']['to'] = sfI18N::getTimestampForCulture($filters['<?php echo $column->getName() ?>']['to'], $this->getUser()->getCulture()); 
     723      if (isset($filters['<?php echo $cname ?>']['from']) && $filters['<?php echo $cname ?>']['from'] !== '') 
     724      { 
     725        $filters['<?php echo $cname ?>']['from'] = sfI18N::getTimestampForCulture($filters['<?php echo $cname ?>']['from'], $this->getUser()->getCulture()); 
     726      } 
     727      if (isset($filters['<?php echo $cname ?>']['to']) && $filters['<?php echo $cname ?>']['to'] !== '') 
     728      { 
     729        $filters['<?php echo $cname ?>']['to'] = sfI18N::getTimestampForCulture($filters['<?php echo $cname ?>']['to'], $this->getUser()->getCulture()); 
    725730      } 
    726731<?php endif; ?> 
    …… 
    825830 
    826831?> 
    827 <?php foreach ($columns as $column):?> 
    828 <?php $columnName = strtoupper($column->getName()); ?> 
    829 <?php if (($column->key == '*') || ($columnName=='')) continue ?> 
     832<?php foreach ($columns as $column): 
     833    $last = strrpos($column->key, '/'); 
     834    $cname = substr($column->key, $last + 1); 
     835?> 
     836<?php $columnName = strtoupper($cname); ?> 
     837<?php if (($column->key == '*') || ($cname=='')) continue ?> 
    830838<?php $type = $column->getCreoleType() ?> 
    831839<?php 

  • plugins/sfExtjsThemePlugin/lib/sfExtjsPropelAdminGenerator.php

    r10079 r10087  
    12891289      $last                 = strrpos($column->key, '/'); 
    12901290      $relatedTableFKs      = substr($column->key, 0, $last); 
     1291      $columnname           = substr($column->key, $last + 1); 
    12911292      $relatedTableGrouped  = $this->getSubGroupedColumns($relatedTableFKs, $groupedColumns); 
    12921293      $relatedTablePK       = $relatedTableGrouped['pk']; 
    …… 
    12941295      $relatedModuleName    = $this->getParameterValue('related_tables.'.$relatedTableName.'.module_name') ? $this->getParameterValue('related_tables.'.$relatedTableName.'.module_name') : $relatedTableName; 
    12951296      $relatedFKColumn      = $this->getColumnForFieldName($fields[0]); 
     1297       
    12961298 
    12971299      $ffcolumn['xtype'] = 'foreignfieldcolumn'; 
    …… 
    13031305      $ffcolumn['relatedTableName'] = $relatedTableName; 
    13041306      $ffcolumn['relatedModuleName'] = $relatedModuleName; 
    1305       $ffcolumn['relatedFieldName'] = $column->getName(); 
     1307      $ffcolumn['relatedFieldName'] = $columnname; 
    13061308      $ffcolumn['queryParam'] = 'filters['.str_replace('/', $this->tableDelimiter, $column->key).']'; 
    13071309      $ffcolumn['sortField'] = str_replace('/', $this->tableDelimiter, $column->key); 
    …… 
    13611363 
    13621364      $last                 = strrpos($column->key, '/'); 
     1365      $columnname           = substr($column->key, $last + 1); 
    13631366      $relatedTableFKs      = substr($column->key, 0, $last); 
    13641367      $relatedTableGrouped  = $this->getSubGroupedColumns($relatedTableFKs, $groupedColumns); 
    …… 
    13821385      $ffcolumn['relatedTableName'] = $relatedTableName; 
    13831386      $ffcolumn['relatedModuleName'] = $relatedModuleName; 
    1384       $ffcolumn['relatedFieldName'] = $column->getName(); 
     1387      $ffcolumn['relatedFieldName'] = $columnname; 
    13851388      $ffcolumn['queryParam'] = 'filters['.str_replace('/', $this->tableDelimiter, $column->key).']'; 
    13861389      $ffcolumn['sortField'] = str_replace('/', $this->tableDelimiter, $column->key); 
    …… 
    17051708  { 
    17061709    $tableName = $column->getTableName(); 
    1707     $relatedFieldName = $tableName.$this->tableDelimiter.$column->getName(); 
     1710     
     1711    $columnname = $column->getName(); 
     1712    $last = strrpos($column->getName(), '/'); 
     1713    if ($last) { 
     1714      $columnname = substr($column->getName(), $last + 1); 
     1715    } 
     1716     
     1717    $relatedFieldName = $tableName.$this->tableDelimiter.$columnname; 
    17081718 
    17091719    return $relatedFieldName;