Development

Changeset 5856

You must first sign up to be able to contribute.

Changeset 5856

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

fixed through_class in admin_*_list tags (closes #1612 - patch from Pascal Borreli)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.0/lib/helper/ObjectAdminHelper.php

    r3746 r5856  
    7373  } 
    7474 
     75  // remove non html option 
     76  unset($options['through_class']); 
    7577  // override field name 
    7678  unset($options['control_name']); 
     
    127129  // get the lists of objects 
    128130  list($objects, $objects_associated, $ids) = _get_object_list($object, $method, $options, $callback); 
     131  // remove non html option 
     132  unset($options['through_class']); 
    129133  // override field name 
    130134  unset($options['control_name']); 
  • branches/1.0/test/functional/backend/m2mTest.php

    r4205 r5856  
    3737    checkResponseElement('link[href][media]', 2)-> 
    3838    checkResponseElement('div.form-row label', 'Author article:', array('position' => 2))-> 
     39    checkResponseElement('div.form-row select[name="unassociated_author_article[]"][through_class]', false)-> 
    3940    checkResponseElement('div.form-row select[name="unassociated_author_article[]"]', true, array('position' => 2))-> 
    4041    checkResponseElement('div.form-row select[name="unassociated_author_article[]"] option', 1)-> 
     42    checkResponseElement('div.form-row select[name="associated_author_article[]"][through_class]', false)-> 
    4143    checkResponseElement('div.form-row select[name="associated_author_article[]"]', true, array('position' => 2))-> 
    4244    checkResponseElement('div.form-row select[name="associated_author_article[]"] option', 2)-> 
     
    4648    checkResponseElement('script[src]', false)-> 
    4749    checkResponseElement('div.form-row label', 'Author article:', array('position' => 2))-> 
     50    checkResponseElement('div.form-row select[name="associated_author_article[]"][through_class]', false)-> 
    4851    checkResponseElement('div.form-row select[name="associated_author_article[]"][multiple="multiple"]', true)-> 
    4952    checkResponseElement('div.form-row select[name="associated_author_article[]"] option', 3)-> 
     
    5659    checkResponseElement('div.form-row input[type="checkbox"][name="associated_author_article[]"][checked="checked"]', 2)-> 
    5760    checkResponseElement('div.form-row input[type="checkbox"][name="associated_author_article[]"]', 3)-> 
     61    checkResponseElement('div.form-row input[type="checkbox"][name="associated_author_article[]"][through_class]', false)-> 
    5862    checkResponseElement('div.form-row label[for="associated_author_article_1"]')-> 
    5963    checkResponseElement('div.form-row label[for="associated_author_article_2"]')->