consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds moderate actions to proposal system notifications

Browse Source
This commit is contained in:
María Checa
2018-05-15 12:55:51 +02:00
committed by decabeza
parent 3cc8b1d123
commit f1e7b634ba
4 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/system_emails_controller.rb
View File

@@ -1,6 +1,6 @@
class Admin::SystemEmailsController < Admin::BaseController
before_action :load_system_email, only: [:view, :preview_pending]
before_action :load_system_email, only: [:view, :preview_pending, :moderate_pending]
def index
@system_emails = {

5
app/models/proposal_notification.rb
View File

@@ -55,4 +55,9 @@ class ProposalNotification < ActiveRecord::Base
self.update(author_id: self.proposal.author_id) if self.proposal
end
def moderate_system_email(moderator)
Notification.where(notifiable_type: 'ProposalNotification', notifiable: self).destroy_all
Activity.log(moderator, :hide, self)
end
end

59
app/views/admin/system_emails/preview_pending/_proposal_notification_digest.html.erb
View File

@@ -1,33 +1,40 @@
<% if preview.proposal.present? %>
<div class="callout highlight">
<div class="row">
<div class="small-12 medium-6 column">
<strong><%= t("admin.shared.proposal") %></strong><br>
<%= link_to preview.proposal.title, proposal_url(preview.proposal) %>
</div>
<div class="small-12 medium-6 column">
<strong><%= t("admin.shared.title") %></strong><br>
<%= link_to preview.title, proposal_url(preview.proposal, anchor: "tab-notifications") %>
<div id="<%= dom_id(preview) %>">
<div class="callout highlight">
<div class="row expanded">
<div class="small-12 medium-6 column">
<strong><%= t("admin.shared.proposal") %></strong><br>
<%= link_to preview.proposal.title, proposal_url(preview.proposal) %>
</div>
<div class="small-12 medium-6 column">
<strong><%= t("admin.shared.title") %></strong><br>
<%= link_to preview.title, proposal_url(preview.proposal, anchor: "tab-notifications") %>
</div>
<div class="small-12 medium-6 column">
<strong><%= t("admin.shared.author") %></strong><br>
<%= preview.proposal.author&.username || '-' %>
</div>
<div class="small-12 medium-6 column">
<strong><%= t("admin.shared.created_at") %></strong><br>
<%= l(preview.created_at, format: :datetime) %>
</div>
</div>
</div>
<div class="row">
<div class="small-12 medium-6 column">
<strong><%= t("admin.shared.author") %></strong><br>
<%= preview.proposal.author&.username || '-' %>
</div>
<div class="small-12 medium-6 column">
<strong><%= t("admin.shared.created_at") %></strong><br>
<%= l(preview.created_at, format: :datetime) %>
</div>
</div>
</div>
<div class="row">
<div class="column">
<strong><%= t("admin.shared.content") %></strong>
<p class="help-text" id="phase-description-help-text">
<%= preview.body %>
</p>
<div class="row">
<div class="column">
<strong><%= t("admin.shared.content") %></strong>
<p id="phase-description-help-text">
<%= preview.body %>
</p>
</div>
</div>
<%= link_to t("admin.system_emails.preview_pending.moderate_pending"),
admin_system_email_moderate_pending_path(system_email_id: 'proposal_notification_digest',
id: preview.id),
method: :put,
class: "button hollow float-right" %>
</div>
<hr>
<% end %>