summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-19 12:13:27 +0000
committerRémy Coutable <remy@rymai.me>2017-06-19 12:13:27 +0000
commit9fe6c2b2c2dd92831c93297021b41d6721e4b201 (patch)
tree004c64b2d777770e606a10500e1a5735c162331a /app
parentff97afdd589b0c3dd93db9eca83b13a09a704a2e (diff)
parentef633d24786707672377312eea850ce2eb63f573 (diff)
downloadgitlab-ce-9fe6c2b2c2dd92831c93297021b41d6721e4b201.tar.gz
Merge branch 'add-since-and-until-params-to-issuables' into 'master'
add created_after and created_before params to issuables Closes #32901 See merge request !12151
Diffstat (limited to 'app')
-rw-r--r--app/finders/issuable_finder.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 957ad875858..558f8b5e2e5 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -41,6 +41,7 @@ class IssuableFinder
items = by_iids(items)
items = by_milestone(items)
items = by_label(items)
+ items = by_created_at(items)
# Filtering by project HAS TO be the last because we use the project IDs yielded by the issuable query thus far
items = by_project(items)
@@ -402,6 +403,18 @@ class IssuableFinder
params[:non_archived].present? ? items.non_archived : items
end
+ def by_created_at(items)
+ if params[:created_after].present?
+ items = items.where(items.klass.arel_table[:created_at].gteq(params[:created_after]))
+ end
+
+ if params[:created_before].present?
+ items = items.where(items.klass.arel_table[:created_at].lteq(params[:created_before]))
+ end
+
+ items
+ end
+
def current_user_related?
params[:scope] == 'created-by-me' || params[:scope] == 'authored' || params[:scope] == 'assigned-to-me'
end