Development

Changeset 6470

You must first sign up to be able to contribute.

Changeset 6470

Show
Ignore:
Timestamp:
12/11/07 22:58:09 (1 year ago)
Author:
Leon.van.der.Ree
Message:

partials are working in the list

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/_json_list_td.php

    r6328 r6470  
    2727    $checkName = $columnName; 
    2828  } 
    29   // TODO: this is a hack! this should be fixed by letting getColumnAjaxTag take the relative $columnName into account, something like $this->getColumnAjaxTag($column, $checkName or $columnName) 
    30   // Due to this hack the column looses all info (like type, length, etc)  
    31   $column = $this->getAdminColumnForField($checkName); 
    3229   
    3330  if (in_array($checkName, $hs)) continue; 
     
    4643  } 
    4744 
     45  if (!$column->isPartial()) 
     46  { 
     47    // TODO: this is a hack! this should be fixed by letting getColumnAjaxTag take the relative $columnName into account, something like $this->getColumnAjaxTag($column, $checkName or $columnName) 
     48    // Due to this hack the column looses all info (like type, length, etc)  
     49    $column = $this->getAdminColumnForField($checkName); 
     50  } 
     51   
    4852  // unfortunately we cannot use the '/' to distinquish the class and the field, because the name is used as variable in _list_ajax_layout.php 
    4953  echo "\"".str_replace('/', $tableDelimiter, $columnName)."\": \"[?php echo str_replace('\"', '\\\"', ".$this->getColumnAjaxTag($column).") ?]\""; 
  • plugins/sfExtjsThemePlugin/lib/sfExtjsPropelAdminGenerator.php

    r6437 r6470  
    900900                           if ('.$store.'.find(\''.str_replace('/', $tableDelimiter, $checkName).'\', this.getRawValue() ) == -1) {'. 
    901901 
    902                              'this.window'.$relatedTableName.' = '.$sfExtjs2Plugin->Window(array( 
     902                             'this.window'.ucfirst($relatedTableName).' = '.$sfExtjs2Plugin->Window(array( 
    903903                               'title' => 'Add new '.$relatedTableName, 
    904904                               'border' => 'false', 
     
    909909                             )).";\n" 
    910910                                                         
    911                              .'this.window'.$relatedTableName.'.show(); 
     911                             .'this.window'.ucfirst($relatedTableName).'.show(); 
    912912                              
    913913                           }