fix some reporter features (WIP)

pull/2612/head
Florian Kraft 10 years ago
parent 6e00f1d82f
commit b3bf61769e
No known key found for this signature in database
GPG Key ID: 786CD08D94605A9E
  1. 2
      app/views/timelines/_general.html.erb
  2. 4
      app/views/timelines/filter/_projects.html.erb
  3. 6
      app/views/timelines/group/_grouping.html.erb
  4. 1
      features/timelines/timeline_view_with_reporters.feature

@ -38,7 +38,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= f.fields_for :options, timeline_options do |ff| %>
<div class="form--field">
<%= ff.hidden_field :exist %>
<%= ff.check_box :hide_chart, label: l('timelines.filter.hide_chart') %>
<%= ff.check_box :hide_chart, { label: l('timelines.filter.hide_chart') }, :yes, :no %>
</div>
<div class="form--field">

@ -35,10 +35,10 @@ See doc/COPYRIGHT.rdoc for more details.
<div style="display:none;">
<%= f.fields_for :options, timeline_options do |ff| %>
<div class="form--field">
<%= ff.check_box :exclude_reporters, label: l('timelines.filter.exclude_reporters') %>
<%= ff.check_box :exclude_reporters, { label: l('timelines.filter.exclude_reporters') }, :yes, :no %>
</div>
<div class="form--field">
<%= ff.check_box :exclude_empty, label: l('timelines.filter.exclude_empty') %>
<%= ff.check_box :exclude_empty, { label: l('timelines.filter.exclude_empty') }, :yes, :no %>
</div>
<div class="form--field">
<% if User.current.impaired? %>

@ -35,7 +35,7 @@ See doc/COPYRIGHT.rdoc for more details.
<div style="display:none;">
<%= f.fields_for :options, timeline_options do |ff| %>
<div class="form--field">
<%= ff.check_box :grouping_one_enabled, label: l('timelines.filter.grouping_one') %>
<%= ff.check_box :grouping_one_enabled, { label: l('timelines.filter.grouping_one') }, :yes, :no %>
</div>
<div class="form--field">
<% if User.current.impaired? %>
@ -66,7 +66,7 @@ See doc/COPYRIGHT.rdoc for more details.
{ label: l('timelines.filter.sort.sortation') }) %>
</div>
<div class="form--field">
<%= ff.check_box :grouping_two_enabled, label: l('timelines.filter.grouping_two') %>
<%= ff.check_box :grouping_two_enabled, { label: l('timelines.filter.grouping_two') }, :yes, :no %>
</div>
<div class="form--field">
<% if User.current.impaired? %>
@ -94,7 +94,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= ff.select(:grouping_two_sort, [[l('timelines.filter.sort.default'), '0'], [l('timelines.filter.sort.date'), '1'], [l('timelines.filter.sort.alphabet'), '2']], label: l('timelines.filter.sort.sortation') ) %>
</div>
<div class="form--field">
<%= ff.check_box :hide_other_group, label: I18n.t('timelines.filter.grouping_hide_group', :group => l('timelines.filter.grouping_other')) %>
<%= ff.check_box :hide_other_group, { label: I18n.t('timelines.filter.grouping_hide_group', :group => l('timelines.filter.grouping_other')) }, :yes, :no %>
</div>
<% end %>
</div>

@ -167,7 +167,6 @@ Feature: Timeline View Tests with reporters
And I go to the page of the timeline "Testline" of the project called "ecookbook"
And I wait for timeline to load table
Then I should not see the project "ecookbook_empty"
And I should see the project "ecookbook_q3"
And I should see the project "ecookbook13"

Loading…
Cancel
Save