Merge pull request #48 from finnlabs/fix/whitespace-cleanup

Cleanup whitespace
pull/6827/head
manwithtwowatches 10 years ago
commit 198541a057
  1. 2
      app/helpers/message_accessibility_helper.rb
  2. 1
      app/models/meeting_participant.rb
  3. 2
      app/views/meeting_contents/show.html.erb
  4. 2
      app/views/shared/_meeting_header.html.erb
  5. 1
      features/support/participant_steps.rb

@ -31,7 +31,7 @@ module MessageAccessibilityHelper
def accessible_time_select(object_name, method, options = {}, html_options = {}) def accessible_time_select(object_name, method, options = {}, html_options = {})
labels = '' labels = ''
select = time_select(object_name, method, options, html_options) select = time_select(object_name, method, options, html_options)
select_ids = select.scan(/<select id="(?<select_id>\w+)"/) select_ids = select.scan(/<select id="(?<select_id>\w+)"/)
ids_with_label = select_ids.zip([:label_meeting_hour, :label_meeting_minute]) ids_with_label = select_ids.zip([:label_meeting_hour, :label_meeting_minute])

@ -51,4 +51,3 @@ class MeetingParticipant < ActiveRecord::Base
self.attributes.reject { |k,v| ['id','meeting_id','attended','created_at', 'updated_at'].include?(k)} self.attributes.reject { |k,v| ['id','meeting_id','attended','created_at', 'updated_at'].include?(k)}
end end
end end

@ -19,4 +19,4 @@ See doc/COPYRIGHT.md for more details.
++#%> ++#%>
<%= render(:partial => "meeting_contents/show", :locals => {:content => @content, :content_type => @content_type, :title => "#{l(:"label_#{@content_type}")}: #{link_to @meeting, @meeting}"}) %> <%= render(:partial => "meeting_contents/show", :locals => {:content => @content, :content_type => @content_type, :title => "#{l(:"label_#{@content_type}")}: #{link_to @meeting, @meeting}"}) %>

@ -21,4 +21,4 @@ See doc/COPYRIGHT.md for more details.
<% content_for :header_tags do %> <% content_for :header_tags do %>
<%= stylesheet_link_tag 'meeting/meeting.css' %> <%= stylesheet_link_tag 'meeting/meeting.css' %>
<% end %> <% end %>

@ -23,4 +23,3 @@ Then(/^the user "(.*?)" should( not)? be available as a participant$/) do |login
step(%{I should#{negative} see "#{user.name}" within "#meeting-form table.list"}) step(%{I should#{negative} see "#{user.name}" within "#meeting-form table.list"})
end end

Loading…
Cancel
Save