mirror of
https://github.com/redmine/redmine.git
synced 2025-11-08 14:26:04 +01:00
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
This commit is contained in:
@@ -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) %>
|
||||
|
||||
@@ -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) %>
|
||||
|
||||
@@ -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!
|
||||
|
||||
Reference in New Issue
Block a user