From 826e978806bbe80d266c1ebdda64fd84b0f5208a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 3 Dec 2016 09:21:12 +0000 Subject: [PATCH] Removes calls to #reset_cycle (#15361). git-svn-id: http://svn.redmine.org/redmine/trunk@16051 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/custom_fields/_index.html.erb | 2 +- app/views/enumerations/index.html.erb | 1 - app/views/files/index.html.erb | 3 +-- app/views/issues/_list.html.erb | 1 - app/views/principal_memberships/_index.html.erb | 2 +- app/views/projects/settings/_members.html.erb | 2 +- app/views/projects/settings/_versions.html.erb | 2 +- app/views/reports/_details.html.erb | 3 +-- app/views/reports/_simple.html.erb | 3 +-- app/views/timelog/_list.html.erb | 1 - 10 files changed, 7 insertions(+), 13 deletions(-) diff --git a/app/views/custom_fields/_index.html.erb b/app/views/custom_fields/_index.html.erb index 417f1c345..1a4caa4b9 100644 --- a/app/views/custom_fields/_index.html.erb +++ b/app/views/custom_fields/_index.html.erb @@ -25,6 +25,6 @@ <%= delete_link custom_field_path(custom_field) %> - <% end; reset_cycle %> + <% end %> diff --git a/app/views/enumerations/index.html.erb b/app/views/enumerations/index.html.erb index 542be0873..01e943e61 100644 --- a/app/views/enumerations/index.html.erb +++ b/app/views/enumerations/index.html.erb @@ -24,7 +24,6 @@ <% end %> -<% reset_cycle %> <% end %>

<%= link_to l(:label_enumeration_new), new_enumeration_path(:type => klass.name) %>

diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index e4c61fb1d..50e7bd966 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -37,8 +37,7 @@ :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %> - <% end - reset_cycle %> + <% end %> <% end %> diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index 9c29a8308..0313f2efa 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -16,7 +16,6 @@ <% grouped_issue_list(issues, @query, @issue_count_by_group) do |issue, level, group_name, group_count, group_totals| -%> <% if group_name %> - <% reset_cycle %>   diff --git a/app/views/principal_memberships/_index.html.erb b/app/views/principal_memberships/_index.html.erb index 7cf6f55bb..8f959583b 100644 --- a/app/views/principal_memberships/_index.html.erb +++ b/app/views/principal_memberships/_index.html.erb @@ -44,7 +44,7 @@ <%= call_table_row_hook principal, membership %> - <% end; reset_cycle %> + <% end %> <% else %> diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb index cb24c39cb..471532266 100644 --- a/app/views/projects/settings/_members.html.erb +++ b/app/views/projects/settings/_members.html.erb @@ -54,7 +54,7 @@ <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %> -<% end; reset_cycle %> +<% end %> <% else %> diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb index 81f3d3353..0c1714446 100644 --- a/app/views/projects/settings/_versions.html.erb +++ b/app/views/projects/settings/_versions.html.erb @@ -36,7 +36,7 @@ <% end %> -<% end; reset_cycle %> +<% end %> <% else %> diff --git a/app/views/reports/_details.html.erb b/app/views/reports/_details.html.erb index 584162939..998089caf 100644 --- a/app/views/reports/_details.html.erb +++ b/app/views/reports/_details.html.erb @@ -25,5 +25,4 @@ <% end %> -<% end - reset_cycle %> +<% end %> diff --git a/app/views/reports/_simple.html.erb b/app/views/reports/_simple.html.erb index c7c88aff4..d6f51ad19 100644 --- a/app/views/reports/_simple.html.erb +++ b/app/views/reports/_simple.html.erb @@ -19,5 +19,4 @@ <% end %> -<% end - reset_cycle %> +<% end %> diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb index e84f428c3..19966920b 100644 --- a/app/views/timelog/_list.html.erb +++ b/app/views/timelog/_list.html.erb @@ -17,7 +17,6 @@ <% grouped_query_results(entries, @query, @entry_count_by_group) do |entry, group_name, group_count, group_totals| -%> <% if group_name %> - <% reset_cycle %>   -- 2.39.5