Check if it's not NONE too

So that we don't have to check it again in somewhere else, and we don't really need to know if it's presented as NONE Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7345/diffs#note_20123999

Check if it's not NONE too
866bb202 · Lin Jen-Shin · Clement Ho · b0d8d742 · 866bb202
Commit 866bb202 authored Dec 16, 2016 by Lin Jen-Shin Committed by Clement Ho Jan 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

issuable_finder.rb app/finders/issuable_finder.rb +6 -6

No files found.
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -166,20 +166,20 @@ class IssuableFinder
  end

  def assignee_id?
-    params[:assignee_id].present?
+    params[:assignee_id].present? && params[:assignee_id] != NONE
  end

  def assignee_username?
-    params[:assignee_username].present?
+    params[:assignee_username].present? && params[:assignee_username] != NONE
  end

  def assignee
    return @assignee if defined?(@assignee)

    @assignee =
-      if assignee_id? && params[:assignee_id] != NONE
+      if assignee_id?
        User.find(params[:assignee_id])
-      elsif assignee_username? && params[:assignee_username] != NONE
+      elsif assignee_username?
        User.find_by(username: params[:assignee_username])
      else
        nil
@@ -187,11 +187,11 @@ class IssuableFinder
  end

  def author_id?
-    params[:author_id].present?
+    params[:author_id].present? && params[:author_id] != NONE
  end

  def author_username?
-    params[:author_username].present?
+    params[:author_username].present? && params[:author_username] != NONE
  end

  def author