Browse Source

Safe navigation

Maarten van den Berg 6 years ago
parent
commit
3925353e1a
4 changed files with 4 additions and 23 deletions
  1. 0 17
      .rubocop.yml
  2. 2 2
      app/controllers/authentication_controller.rb
  3. 1 1
      app/models/activity.rb
  4. 1 3
      app/models/person.rb

+ 0 - 17
.rubocop.yml

268
     - 'app/models/token.rb'
268
     - 'app/models/token.rb'
269
     - 'app/models/user.rb'
269
     - 'app/models/user.rb'
270
 
270
 
271
-# Offense count: 3
272
-# Cop supports --auto-correct.
273
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
274
-# Whitelist: present?, blank?, presence, try, try!
275
-Style/SafeNavigation:
276
-  Exclude:
277
-    - 'app/controllers/authentication_controller.rb'
278
-    - 'app/models/person.rb'
279
-
280
 # Offense count: 215
271
 # Offense count: 215
281
 # Cop supports --auto-correct.
272
 # Cop supports --auto-correct.
282
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
273
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
302
     - 'app/models/member.rb'
293
     - 'app/models/member.rb'
303
     - 'db/migrate/20180904163645_generate_calendar_tokens.rb'
294
     - 'db/migrate/20180904163645_generate_calendar_tokens.rb'
304
 
295
 
305
-# Offense count: 1
306
-# Cop supports --auto-correct.
307
-# Configuration parameters: EnforcedStyleForMultiline.
308
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
309
-Style/TrailingCommaInArguments:
310
-  Exclude:
311
-    - 'app/models/activity.rb'
312
-
313
 # Offense count: 3
296
 # Offense count: 3
314
 # Cop supports --auto-correct.
297
 # Cop supports --auto-correct.
315
 # Configuration parameters: WordRegex.
298
 # Configuration parameters: WordRegex.

+ 2 - 2
app/controllers/authentication_controller.rb

11
     else
11
     else
12
       u = User.find_by(email: params[:session][:email])
12
       u = User.find_by(email: params[:session][:email])
13
 
13
 
14
-      if u && u.confirmed && u.authenticate(params[:session][:password])
14
+      if u&.confirmed && u&.authenticate(params[:session][:password])
15
         log_in(u, params[:session][:remember_me].to_i)
15
         log_in(u, params[:session][:remember_me].to_i)
16
 
16
 
17
         flash_message(:success, I18n.t(:greeting, name: u.person.first_name))
17
         flash_message(:success, I18n.t(:greeting, name: u.person.first_name))
53
     end
53
     end
54
 
54
 
55
     user = User.find_by(person: person)
55
     user = User.find_by(person: person)
56
-    if user && user.confirmed
56
+    if user&.confirmed
57
       flash_message(:warning, I18n.t('authentication.already_activated'))
57
       flash_message(:warning, I18n.t('authentication.already_activated'))
58
       redirect_to action: 'login'
58
       redirect_to action: 'login'
59
       return
59
       return

+ 1 - 1
app/models/activity.rb

144
     people.each do |p|
144
     people.each do |p|
145
       Participant.create(
145
       Participant.create(
146
         activity: self,
146
         activity: self,
147
-        person: p,
147
+        person: p
148
       )
148
       )
149
     end
149
     end
150
   end
150
   end

+ 1 - 3
app/models/person.rb

207
   # Ensure the person's user email is updated at the same time as the person's
207
   # Ensure the person's user email is updated at the same time as the person's
208
   # email.
208
   # email.
209
   def update_user_email
209
   def update_user_email
210
-    unless self.user.nil?
211
-      self.user.update!(email: self.email)
212
-    end
210
+    self.user&.update!(email: self.email)
213
   end
211
   end
214
 end
212
 end