adding join call to all arrays in content_tag

Array#to_s acts differently on 1.8.x and 1.9
pull/6827/head
Gregor Schmidt 13 years ago
parent 9018207ae0
commit e0e86c92ad
  1. 4
      app/helpers/rb_master_backlogs_helper.rb
  2. 2
      lib/backlogs/issue_actions.rb
  3. 2
      lib/backlogs/issue_edit_actions.rb
  4. 4
      lib/backlogs/issue_form.rb
  5. 2
      lib/backlogs/issue_form/notes_paragraph.rb
  6. 2
      lib/backlogs/issue_view/issue_hierarchy_paragraph.rb

@ -11,10 +11,10 @@ module RbMasterBacklogsHelper
backlog_menu_items_for(backlog).map do |item| backlog_menu_items_for(backlog).map do |item|
content_tag(:li, item, :class => 'item') content_tag(:li, item, :class => 'item')
end end.join
end end
] ].join
end end
end end

@ -8,6 +8,6 @@ class Backlogs::IssueActions < ChiliProject::Nissue::View
content_tag(:div, [ content_tag(:div, [
t.watcher_link(@issue, User.current, :class => css_class, :replace => ".#{css_class}"), t.watcher_link(@issue, User.current, :class => css_class, :replace => ".#{css_class}"),
(t.modal_link_to(l(:button_update), {:controller => 'issue_boxes', :action => 'edit', :id => @issue }, :class => 'icon icon-edit') if t.authorize_for('issue_boxes', 'edit')) (t.modal_link_to(l(:button_update), {:controller => 'issue_boxes', :action => 'edit', :id => @issue }, :class => 'icon icon-edit') if t.authorize_for('issue_boxes', 'edit'))
], :class => 'contextual') ].join, :class => 'contextual')
end end
end end

@ -17,6 +17,6 @@ class Backlogs::IssueEditActions < ChiliProject::Nissue::View
:update => @html_id, :update => @html_id,
:with => "Form.serialize('#{@form_id}')" :with => "Form.serialize('#{@form_id}')"
}, { :class => 'icon icon-save', :accesskey => t.accesskey(:update) }) if t.authorize_for('issue_boxes', 'update')) }, { :class => 'icon icon-save', :accesskey => t.accesskey(:update) }) if t.authorize_for('issue_boxes', 'update'))
], :class => 'contextual') ].join, :class => 'contextual')
end end
end end

@ -19,12 +19,12 @@ class Backlogs::IssueForm < Backlogs::IssueView
errors_paragraph.render(t), errors_paragraph.render(t),
s, s,
notes_paragraph.render(t) notes_paragraph.render(t)
], :id => form_id) ].join, :id => form_id)
end end
def errors_paragraph def errors_paragraph
@errors_paragraph ||= ChiliProject::Nissue::SimpleParagraph.new(@issue) do |t| @errors_paragraph ||= ChiliProject::Nissue::SimpleParagraph.new(@issue) do |t|
content_tag(:div, [t.error_messages_for('issue')], :style => "clear:right") content_tag(:div, t.error_messages_for('issue'), :style => "clear:right")
end end
end end

@ -8,7 +8,7 @@ class Backlogs::IssueForm::NotesParagraph < ChiliProject::Nissue::IssueView::Des
s = content_tag(:fieldset, [ s = content_tag(:fieldset, [
content_tag(:legend, l(:field_notes)), content_tag(:legend, l(:field_notes)),
t.text_area_tag('issue[notes]', '', :cols => 60, :rows => 10, :class => 'wiki-edit', :id => html_id), t.text_area_tag('issue[notes]', '', :cols => 60, :rows => 10, :class => 'wiki-edit', :id => html_id),
t.wikitoolbar_for(html_id) ] t.wikitoolbar_for(html_id) ].join
) )
end end
end end

@ -65,7 +65,7 @@ class Backlogs::IssueView::IssueHierarchyParagraph < ChiliProject::Nissue::Issue
content_tag('td', h(issue.status)), content_tag('td', h(issue.status)),
content_tag('td', t.link_to_user(issue.assigned_to)), content_tag('td', t.link_to_user(issue.assigned_to)),
content_tag('td', t.link_to_version(issue.fixed_version)) content_tag('td', t.link_to_version(issue.fixed_version))
], ].join,
:class => css_classes.join(' ')) :class => css_classes.join(' '))
end end
end end

Loading…
Cancel
Save