ソースを参照

Fix issue preventing 'none_present'-messages

Cause: empty list is still truthy, should check .count
Maarten van den Berg 7 年 前
コミット
c359326611
共有1 個のファイルを変更した3 個の追加3 個の削除を含む
  1. 3 3
      app/controllers/api/activities_controller.rb

+ 3 - 3
app/controllers/api/activities_controller.rb

40
     absentnames = absent
40
     absentnames = absent
41
       .map{|p| p.person.first_name }
41
       .map{|p| p.person.first_name }
42
 
42
 
43
-    if presentnames
43
+    if presentnames.count > 0
44
       present_mess = I18n.t('activities.participant.these_present', count: present.count, names: presentnames.join(', '))
44
       present_mess = I18n.t('activities.participant.these_present', count: present.count, names: presentnames.join(', '))
45
     else
45
     else
46
       present_mess = I18n.t('activities.participant.none_present')
46
       present_mess = I18n.t('activities.participant.none_present')
47
     end
47
     end
48
 
48
 
49
-    if unknownnames
49
+    if unknownnames.count > 0
50
       unknown_mess = I18n.t('activities.participant.these_unknown', count: unknown.count, names: unknownnames.join(', '))
50
       unknown_mess = I18n.t('activities.participant.these_unknown', count: unknown.count, names: unknownnames.join(', '))
51
     else
51
     else
52
       unknown_mess = I18n.t('activities.participant.none_unknown')
52
       unknown_mess = I18n.t('activities.participant.none_unknown')
53
     end
53
     end
54
 
54
 
55
-    if absentnames
55
+    if absentnames.count > 0
56
       absent_mess = I18n.t('activities.participant.these_absent', count: absent.count, names: absentnames.join(', '))
56
       absent_mess = I18n.t('activities.participant.these_absent', count: absent.count, names: absentnames.join(', '))
57
     else
57
     else
58
       absent_mess = I18n.t('activities.participant.none_absent')
58
       absent_mess = I18n.t('activities.participant.none_absent')