Changeset 1138

Show
Ignore:
Timestamp:
2008-08-24 22:30:36 (5 months ago)
Author:
gaspard
Message:

r785@gaspard: gaspard | 2008-08-24 22:32:31 +0200
Fixed a bug preventing [select] on 'klass' to correctly set 'selected' option.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lib/parser/lib/rules/zena.rb

    r1137 r1138  
    864864        class_opts[:without]   = @params[:without]  if @params[:without] 
    865865        # do not use 'selected' if the node is not new 
    866         "#{select_tag}<%= options_for_select(Node.classes_for_form(:class => #{klass.inspect}#{params_to_erb(class_opts)}), (#{node}.new_record? ? nil : #{selected})) %></select>" 
     866        "#{select_tag}<%= options_for_select(Node.classes_for_form(:class => #{klass.inspect}#{params_to_erb(class_opts)}), (#{node}.new_record? ? #{selected} : #{node}.klass)) %></select>" 
    867867      elsif @params[:type] == 'time_zone' 
    868868        # <r:select name='d_tz' type='time_zone'/> 
  • trunk/test/helpers/zena_parser/basic.yml

    r1132 r1138  
    843843  res: "<li><i>dark</i>, design by <a href='http://teti.ch'>vador</a></li>" 
    844844   
    845 select_class
    846   context: 
    847     node: 'opening
     845select_class_existing_node
     846  context: 
     847    node: 'letter
    848848  src: "<r:form><select name='klass' root_class='Note' selected='Post'/></r:form>" 
    849   res: "/<select name=.node\[klass\].><option value=\"Note\">Note<\/option>\n<option value=\"Letter\">  Letter<\/option>\n<option value=\"Post\" selected=\"selected\">  Post<\/option><\/select>/" 
    850  
     849  res: "/<select name=.node\[klass\].><option value=\"Note\">Note<\/option>\n<option value=\"Letter\" selected=\"selected\">  Letter<\/option>\n<option value=\"Post\">  Post<\/option><\/select>/" 
     850 
     851select_class_new_node: 
     852  src: "<r:pages><r:each/><r:add/><r:form><select name='klass' root_class='Note' selected='Post'/></r:form>" 
     853  res: "/<select.*name=.node\[klass\].*Note.*Letter.*Post. selected=.selected./" 
     854   
    851855select_nodes: 
    852856  src: "<r:form><select nodes='images in site' name='d_ref'></select></r:form>"