diff options
author | mhasbini <mohammad.hasbini@gmail.com> | 2017-02-17 20:28:32 +0200 |
---|---|---|
committer | mhasbini <mohammad.hasbini@gmail.com> | 2017-02-17 20:28:32 +0200 |
commit | 7362fd6fdf4704314acbe9760a329ffe23337af0 (patch) | |
tree | 194114ab4f6776712d47a0da19d992c5d02e2df5 /app/finders/issuable_finder.rb | |
parent | 827a56a47914f128a78deade463d589328d18fc1 (diff) | |
download | gitlab-ce-7362fd6fdf4704314acbe9760a329ffe23337af0.tar.gz |
add a :iids param to IssuableFinder
Diffstat (limited to 'app/finders/issuable_finder.rb')
-rw-r--r-- | app/finders/issuable_finder.rb | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 1576fc80a6b..206c92fe82a 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -16,6 +16,7 @@ # label_name: string # sort: string # non_archived: boolean +# iids: integer[] # class IssuableFinder NONE = '0' @@ -40,6 +41,7 @@ class IssuableFinder items = by_label(items) items = by_due_date(items) items = by_non_archived(items) + items = by_iids(items) sort(items) end @@ -266,16 +268,11 @@ class IssuableFinder end def by_search(items) - if search - items = - if search =~ iid_pattern - items.where(iid: $~[:iid]) - else - items.full_search(search) - end - end + search ? items.full_search(search) : items + end - items + def by_iids(items) + params[:iids].present? ? items.where(iid: params[:iids]) : items end def sort(items) |