Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-08 14:26:04 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16635 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-06-07 19:56:22 +00:00
parent 7814772918
commit c513037c6e
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/timelog/index.html.erb
View File

@@ -10,6 +10,7 @@
<%= render :partial => 'date_range' %> <%= render :partial => 'date_range' %>
<% end %> <% end %>
<% if @query.valid? %>
<% if @entries.empty? %> <% if @entries.empty? %>
<p class="nodata"><%= l(:label_no_data) %></p> <p class="nodata"><%= l(:label_no_data) %></p>
<% else %> <% else %>
@@ -37,6 +38,7 @@
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
<% end %>
<% content_for :sidebar do %> <% content_for :sidebar do %>
<%= render_sidebar_queries(TimeEntryQuery, @project) %> <%= render_sidebar_queries(TimeEntryQuery, @project) %>

2
app/views/timelog/report.html.erb
View File

@@ -26,6 +26,7 @@
<%= link_to l(:button_clear), {:params => request.query_parameters.merge(:criteria => nil)}, :class => 'icon icon-reload' %></p> <%= link_to l(:button_clear), {:params => request.query_parameters.merge(:criteria => nil)}, :class => 'icon icon-reload' %></p>
<% end %> <% end %>
<% if @query.valid? %>
<% unless @report.criteria.empty? %> <% unless @report.criteria.empty? %>
<% if @report.hours.empty? %> <% if @report.hours.empty? %>
<p class="nodata"><%= l(:label_no_data) %></p> <p class="nodata"><%= l(:label_no_data) %></p>
@@ -65,6 +66,7 @@
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>
<% end %>
<% content_for :sidebar do %> <% content_for :sidebar do %>
<%= render_sidebar_queries(TimeEntryQuery, @project) %> <%= render_sidebar_queries(TimeEntryQuery, @project) %>

8
test/functional/timelog_controller_test.rb
View File

@@ -989,6 +989,14 @@ class TimelogControllerTest < Redmine::ControllerTest
assert_equal 3, values.size assert_equal 3, values.size
end 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 def test_index_with_query
query = TimeEntryQuery.new(:project_id => 1, :name => 'Time Entry Query', :visibility => 2) query = TimeEntryQuery.new(:project_id => 1, :name => 'Time Entry Query', :visibility => 2)
query.save! query.save!