Merged r13835 from trunk to 2.6-stable

remove duplicated :id key from app/views/timelog/report.html.erb

Ruby 2.2 shows warning.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13837 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/timelog/report.html.erb b/app/views/timelog/report.html.erb
index cb556a6565161092cd0eaba4b473e719418a4d24..176f128e06f1945d6b5e1fd283362f8aeef985e4 100644 (file)
--- a/app/views/timelog/report.html.erb
+++ b/app/views/timelog/report.html.erb
@@ -23,8 +23,8 @@
   <label for='criterias'><%= l(:button_add) %></label>: <%= select_tag('criteria[]', options_for_select([[]] + (@report.available_criteria.keys - @report.criteria).collect{|k| [l_or_humanize(@report.available_criteria[k][:label]), k]}),
                                                           :onchange => "this.form.submit();",
                                                           :style => 'width: 200px',
-                                                          :id => nil,
-                                                          :disabled => (@report.criteria.length >= 3), :id => "criterias") %>
+                                                          :disabled => (@report.criteria.length >= 3),
+                                                          :id => "criterias") %>
      <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @report.columns}, :class => 'icon icon-reload' %></p>
 <% end %>