diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-01-23 22:00:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 22:00:13 +0100 |
| commit | f52c988e12e464e7baefc2fdb48ddf4a95584664 (patch) | |
| tree | 1849998c1180280751f829769c10c84986bf0953 /app/helpers/admin/announcements_helper.rb | |
| parent | 81cc86bb1ffb662843938379eeb522e3a6f11b79 (diff) | |
Add announcements (#12662)
* Add announcements Fix #11006 * Add reactions to announcements * Add admin UI for announcements * Add unit tests * Fix issues - Add `with_dismissed` param to announcements API - Fix end date not being formatted when time range is given - Fix announcement delete causing reactions to send streaming updates - Fix announcements container growing too wide and mascot too small - Fix `all_day` being settable when no time range is given - Change text "Update" to "Announcement" * Fix scheduler unpublishing announcements before they are due * Fix filter params not being passed to announcements filter
Diffstat (limited to 'app/helpers/admin/announcements_helper.rb')
| -rw-r--r-- | app/helpers/admin/announcements_helper.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/helpers/admin/announcements_helper.rb b/app/helpers/admin/announcements_helper.rb new file mode 100644 index 000000000..0c053ddec --- /dev/null +++ b/app/helpers/admin/announcements_helper.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module Admin::AnnouncementsHelper + def time_range(announcement) + if announcement.all_day? + safe_join([l(announcement.starts_at.to_date), ' - ', l(announcement.ends_at.to_date)]) + else + safe_join([l(announcement.starts_at), ' - ', l(announcement.ends_at)]) + end + end +end |