DOn't show time entries when query is invalid (#23912).

git-svn-id: http://svn.redmine.org/redmine/trunk@16635 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index b863ee40f93734a957c05b0ba6aee9a194f0ff6c..0932c58ae6dc36823c099d1bc746992b76b99f15 100644 (file)
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -10,6 +10,7 @@
 <%= render :partial => 'date_range' %>
 <% end %>
 
+<% if @query.valid? %>
 <% if @entries.empty? %>
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% else %>
@@ -37,6 +38,7 @@
   <% end %>
 </div>
 <% end %>
+<% end %>
 
 <% content_for :sidebar do %>
   <%= render_sidebar_queries(TimeEntryQuery, @project) %>

diff --git a/app/views/timelog/report.html.erb b/app/views/timelog/report.html.erb
index a06b219beb599f5a403428a6c1ad4180880f6d4d..0565c662b81915af0abce15c4b9ae523f9902deb 100644 (file)
--- a/app/views/timelog/report.html.erb
+++ b/app/views/timelog/report.html.erb
@@ -26,6 +26,7 @@
      <%= link_to l(:button_clear), {:params => request.query_parameters.merge(:criteria => nil)}, :class => 'icon icon-reload' %></p>
 <% end %>
 
+<% if @query.valid? %>
 <% unless @report.criteria.empty? %>
 <% if @report.hours.empty? %>
 <p class="nodata"><%= l(:label_no_data) %></p>
@@ -65,6 +66,7 @@
 <% end %>
 <% end %>
 <% end %>
+<% end %>
 
 <% content_for :sidebar do %>
   <%= render_sidebar_queries(TimeEntryQuery, @project) %>

diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 4e6df7e1bc33ac567bd436d3bd5b6773ab511318..b450f5129f42aa017b8a77c0db2a379e4a2f1c56 100644 (file)
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -989,6 +989,14 @@ class TimelogControllerTest < Redmine::ControllerTest
     assert_equal 3, values.size
   end
 
+  def test_index_with_invalid_date_filter_should_not_validate
+    @request.session[:user_id] = 2
+
+    get :index, :params => {:set_filter => '1', :f => ['spent_on'], :op => {'spent_on' => '='}, :v => {'spent_on' => ['2016-09-010']}}
+    assert_select_error 'Date is invalid'
+    assert_select 'table.time-entries', 0
+  end
+
   def test_index_with_query
     query = TimeEntryQuery.new(:project_id => 1, :name => 'Time Entry Query', :visibility => 2)
     query.save!