Skip to content

Commit 8c9d0ed

Browse files
committed
fixed linter issues
1 parent 7ad0af9 commit 8c9d0ed

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

app/controllers/admin/activities_controller.rb

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,11 @@ def weekoverzicht(locale)
3737
end
3838
end.join("\n")
3939
header = "\n*#{ t('admin.activities.weekoverzicht.borrel', locale: locale) }*"
40-
borrels = Activity.where("start_date >= ? AND start_date <= ? AND is_borrel = TRUE AND include_in_weekoverzicht = FALSE", week_start, week_start + 7.days)
41-
if borrels.empty?
42-
res += "#{ header }\n#{ t('admin.activities.weekoverzicht.no_borrel', locale:locale) }"
43-
else
44-
res += header + "\n#{ locale == :nl ? "Op" : "On" } #{ l(borrels[0].start_date, format: '%A', locale: locale) }!"
45-
end
40+
borrels = Activity.where("start_date >= ? AND start_date <= ? \
41+
AND is_borrel = TRUE AND include_in_weekoverzicht = FALSE", week_start, week_start + 7.days)
42+
res += if borrels.empty? then \
43+
"#{ header }\n#{ t('admin.activities.weekoverzicht.no_borrel', locale: locale) }" else \
44+
header + "\n#{ locale == :nl ? 'Op' : 'On' } #{ l(borrels[0].start_date, format: '%A', locale: locale) }!"
4645
res
4746
end
4847
helper_method :weekoverzicht

app/views/admin/activities/index.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@
5757
- elsif activity.price == 0
5858
%span.badge.badge-primary.size-small= I18n.t('admin.activities.free')
5959
- else
60-
%span.badge.badge-warning.size-small= I18n.t('admin.activities.is_not_payable')
60+
%span.badge.badge-warning.size-small= I18n.t('admin.activities.is_not_payable')

0 commit comments

Comments
 (0)