consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup Lint/AssignmentInCondition rubocop issues on code and remove it from ruboco_todo list

Browse Source
This commit is contained in:
Bertocq
2017-06-16 00:17:19 +02:00
parent 87e73e772c
commit 21c6d1c4dd
7 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/notification.rb
View File

@@ -17,7 +17,9 @@ class Notification < ActiveRecord::Base
end
def self.add(user_id, notifiable)
if notification = Notification.find_by(user_id: user_id, notifiable: notifiable)
notification = Notification.find_by(user_id: user_id, notifiable: notifiable)
if notification.present?
Notification.increment_counter(:counter, notification.id)
else
Notification.create!(user_id: user_id, notifiable: notifiable)
@@ -50,4 +52,4 @@ class Notification < ActiveRecord::Base
notifiable.is_a?(ProposalNotification) ? notifiable.proposal : notifiable
end
end
end

5
app/models/site_customization/image.rb
View File

@@ -21,9 +21,8 @@ class SiteCustomization::Image < ActiveRecord::Base
def self.image_path_for(filename)
image_name = filename.split(".").first
if i = find_by(name: image_name)
i.image.exists? ? i.image.url : nil
end
imageable = find_by(name: image_name)
imageable.present? && imageable.image.exists? ? imageable.image.url : nil
end
def required_width