Development

Changeset 5998

You must first sign up to be able to contribute.

Changeset 5998

Show
Ignore:
Timestamp:
11/13/07 18:14:24 (1 year ago)
Author:
fabien
Message:

fixed admin generator filters HTML defect (closes #1891 - patch from Pascal Borreli)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lib/plugins/sfPropelPlugin/data/generator/sfPropelAdmin/default/template/templates/_filters.php

    r3054 r5998  
    1313<?php endif; ?> 
    1414    <div class="form-row"> 
    15     <label for="<?php echo $column->getName() ?>">[?php echo __('<?php echo str_replace("'", "\\'", $this->getParameterValue('list.fields.'.$column->getName().'.name')) ?>:') ?]</label> 
     15    <label for="filters_<?php echo $column->getName() ?>">[?php echo __('<?php echo str_replace("'", "\\'", $this->getParameterValue('list.fields.'.$column->getName().'.name')) ?>:') ?]</label> 
    1616    <div class="content"> 
    1717    [?php echo <?php echo $this->getColumnFilterTag($column) ?> ?] 
    1818<?php if ($this->getParameterValue('list.fields.'.$column->getName().'.filter_is_empty')): ?> 
    19     <div>[?php echo checkbox_tag('filters[<?php echo $column->getName() ?>_is_empty]', 1, isset($filters['<?php echo $column->getName() ?>_is_empty']) ? $filters['<?php echo $column->getName() ?>_is_empty'] : null) ?]&nbsp;<label for="filters[<?php echo $column->getName() ?>_is_empty]">[?php echo __('is empty') ?]</label></div> 
     19    <div>[?php echo checkbox_tag('filters[<?php echo $column->getName() ?>_is_empty]', 1, isset($filters['<?php echo $column->getName() ?>_is_empty']) ? $filters['<?php echo $column->getName() ?>_is_empty'] : null) ?]&nbsp;<label for="filters_<?php echo $column->getName() ?>_is_empty">[?php echo __('is empty') ?]</label></div> 
    2020<?php endif; ?> 
    2121    </div> 
  • trunk/lib/plugins/sfPropelPlugin/test/functional/filterTest.php

    r5103 r5998  
    2424$b-> 
    2525  checkListCustomization('filters', array('filters' => array('title', 'body', 'online', 'category_id', 'created_at')))-> 
    26   checkResponseElement('div.sf_admin_filters label[for="title"]', 'Title:')-> 
     26  checkResponseElement('div.sf_admin_filters label[for="filters_title"]', 'Title:')-> 
    2727  checkResponseElement('div.sf_admin_filters input[name="filters[title]"][id="filters_title"]')-> 
    28   checkResponseElement('div.sf_admin_filters label[for="body"]', 'Body:')-> 
     28  checkResponseElement('div.sf_admin_filters label[for="filters_body"]', 'Body:')-> 
    2929  checkResponseElement('div.sf_admin_filters input[name="filters[body]"][id="filters_body"]')-> 
    30   checkResponseElement('div.sf_admin_filters label[for="online"]', 'Online:')-> 
     30  checkResponseElement('div.sf_admin_filters label[for="filters_online"]', 'Online:')-> 
    3131  checkResponseElement('div.sf_admin_filters select[name="filters[online]"][id="filters_online"] option', 3)-> 
    32   checkResponseElement('div.sf_admin_filters label[for="category_id"]', 'Category:')-> 
     32  checkResponseElement('div.sf_admin_filters label[for="filters_category_id"]', 'Category:')-> 
    3333  checkResponseElement('div.sf_admin_filters select[name="filters[category_id]"][id="filters_category_id"] option', 3)-> 
    34   checkResponseElement('div.sf_admin_filters label[for="created_at"]', 'Created at:')-> 
     34  checkResponseElement('div.sf_admin_filters label[for="filters_created_at"]', 'Created at:')-> 
    3535  checkResponseElement('div.sf_admin_filters input[name="filters[created_at][from]"][id="filters_created_at_from"]')-> 
    3636  checkResponseElement('div.sf_admin_filters input[name="filters[created_at][to]"][id="filters_created_at_to"]') 
     
    3939$b-> 
    4040  checkListCustomization('filters', array('filters' => array('title'), 'fields' => array('title' => array('filter_is_empty' => true))))-> 
    41   checkResponseElement('div.sf_admin_filters label[for="filters[title_is_empty]"]') 
     41  checkResponseElement('div.sf_admin_filters label[for="filters_title_is_empty"]') 
    4242;