diff --git a/app/helpers/reporting_helper.rb b/app/helpers/reporting_helper.rb
index 01434b42b8..1181fb3408 100644
--- a/app/helpers/reporting_helper.rb
+++ b/app/helpers/reporting_helper.rb
@@ -21,21 +21,24 @@ module ReportingHelper
[
{:name => :activate_filter, :filter_name => filter.underscore_name, :label => l(filter.label)},
{:name => :operators, :filter_name => filter.underscore_name, :operators => filter.available_operators},
- {:name => :multi_values, :filter_name => filter.underscore_name, :values => filter.available_values(User.current)}]
+ {:name => :multi_values, :filter_name => filter.underscore_name, :values => filter.available_values(User.current)},
+ {:name => :remove_filter, :filter_name => filter.underscore_name}]
end
def date_elements(filter)
[
{:name => :activate_filter, :filter_name => filter.underscore_name, :label => l(filter.label)},
{:name => :operators, :filter_name => filter.underscore_name, :operators => filter.available_operators},
- {:name => :date, :filter_name => filter.underscore_name}]
+ {:name => :date, :filter_name => filter.underscore_name},
+ {:name => :remove_filter, :filter_name => filter.underscore_name}]
end
def text_elements(filter)
[
{:name => :activate_filter, :filter_name => filter.underscore_name, :label => l(filter.label)},
{:name => :operators, :filter_name => filter.underscore_name, :operators => filter.available_operators},
- {:name => :text_box, :filter_name => filter.underscore_name}]
+ {:name => :text_box, :filter_name => filter.underscore_name},
+ {:name => :remove_filter, :filter_name => filter.underscore_name}]
end
def link_to_project(project)
diff --git a/app/views/cost_reports/filters/_activate_filter.rhtml b/app/views/cost_reports/filters/_activate_filter.rhtml
index 9b5f530cea..df93f8c3d5 100644
--- a/app/views/cost_reports/filters/_activate_filter.rhtml
+++ b/app/views/cost_reports/filters/_activate_filter.rhtml
@@ -2,13 +2,10 @@
This partial requires the following locals:
element a Hash containing the following keys:
- :name => :activate_filter
- - :filter_name => String: The name of a filter (e.g. activity_id)
- :label => String: A text which is shown to the user as a label for this filter
- :width => Integer (optional): The width this partial may consume. If not given, a standard width will be applied
%>
-
-
-
+
+
\ No newline at end of file
diff --git a/app/views/cost_reports/filters/_remove_filter.rhtml b/app/views/cost_reports/filters/_remove_filter.rhtml
new file mode 100644
index 0000000000..9e32cfb131
--- /dev/null
+++ b/app/views/cost_reports/filters/_remove_filter.rhtml
@@ -0,0 +1,10 @@
+<%#
+ This partial requires the following locals:
+ element a Hash containing the following keys:
+ - :filter_name => String: The name of a filter (e.g. activity_id)
+ - :hide => Boolean (optional, default = true): whether the content of this partial is initially hidden or not
+%>
+