diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-27 17:26:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-27 17:26:53 +0100 |
| commit | 67b8af34b3df55ba74a53af731f275d0a4c6d9f8 (patch) | |
| tree | d1f2420e0ea7cea72ea8032ce005c39c36f38a43 /app/views/admin | |
| parent | 8924743349ec5ce37cd949445e071c14968ec2ec (diff) | |
| parent | cf230d551f3081115402f74d4326a2682f27fedc (diff) | |
Merge pull request #1271 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/announcements/_announcement.html.haml | 9 | ||||
| -rw-r--r-- | app/views/admin/announcements/edit.html.haml | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/views/admin/announcements/_announcement.html.haml b/app/views/admin/announcements/_announcement.html.haml index 75768c7ba..f8a6c66de 100644 --- a/app/views/admin/announcements/_announcement.html.haml +++ b/app/views/admin/announcements/_announcement.html.haml @@ -10,5 +10,12 @@ - else = l(announcement.created_at) %td - = table_link_to 'pencil', t('generic.edit'), edit_admin_announcement_path(announcement) if can?(:update, announcement) + - if can?(:update, announcement) + - if announcement.published? + = table_link_to 'pause', t('admin.announcements.unpublish'), unpublish_admin_announcement_path(announcement), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } + - else + = table_link_to 'play', t('admin.announcements.publish'), publish_admin_announcement_path(announcement), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } + + = table_link_to 'pencil', t('generic.edit'), edit_admin_announcement_path(announcement) + = table_link_to 'trash', t('generic.delete'), admin_announcement_path(announcement), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, announcement) diff --git a/app/views/admin/announcements/edit.html.haml b/app/views/admin/announcements/edit.html.haml index c5c605e93..5f56db5e7 100644 --- a/app/views/admin/announcements/edit.html.haml +++ b/app/views/admin/announcements/edit.html.haml @@ -14,7 +14,7 @@ .fields-group = f.input :text, wrapper: :with_block_label - - if @announcement.scheduled_at.present? && !@announcement.published? + - unless @announcement.published? .fields-group = f.input :scheduled_at, include_blank: true, wrapper: :with_block_label |