[PATCH/foreman 1/1] fixes #1337 with return if user.nil?

Development
1

Signed-off-by: Romain Vrignaud <romain@yakaz.com>

··· From: Romain Vrignaud --- app/models/bookmark.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index de28b6e…2dbc4ea 100644
— a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -10,9 +10,9 @@ class Bookmark < ActiveRecord::Base
before_validation :set_default_user

named_scope :my_bookmarks, lambda {

  • return {} unless SETTINGS[:login]
  • user = User.current
  • return {} unless SETTINGS[:login] and !user.nil?
  • user = User.current
    conditions = sanitize_sql_for_conditions(["((bookmarks.public = ?) OR (bookmarks.owner_id in (?) AND bookmarks.owner_type = ‘Usergroup’) OR (bookmarks.owner_id = ? AND bookmarks.owner_type = ‘User’))", true, user.my_usergroups.map(&:id), user.id])
    {:conditions => conditions}
    }
    –
    1.7.2.5