summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-06 12:32:04 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-06 12:32:04 -0800
commit4165426725677d092275f2935a43527f130d8bcb (patch)
treeb5298db92a5ad992f9d2b1925dd20fcb1174adcc /app/helpers
parent560e717fd6cc4e1a6055e2d84432fe3ad60ce7eb (diff)
downloadgitlab-ce-4165426725677d092275f2935a43527f130d8bcb.tar.gz
Restyle and refactor milestones filter
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/groups_helper.rb12
-rw-r--r--app/helpers/milestones_helper.rb9
2 files changed, 9 insertions, 12 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index 975cdeda1bc..03fd461a462 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -33,18 +33,6 @@ module GroupsHelper
title
end
- def group_filter_path(entity, options={})
- exist_opts = {
- status: params[:status]
- }
-
- options = exist_opts.merge(options)
-
- path = request.path
- path << "?#{options.to_param}"
- path
- end
-
def group_settings_page?
if current_controller?('groups')
current_action?('edit') || current_action?('projects')
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
new file mode 100644
index 00000000000..6847123d2d4
--- /dev/null
+++ b/app/helpers/milestones_helper.rb
@@ -0,0 +1,9 @@
+module MilestonesHelper
+ def milestones_filter_path(opts = {})
+ if @project
+ project_milestones_path(@project, opts)
+ elsif @group
+ group_milestones_path(@group, opts)
+ end
+ end
+end