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

Make confirmation alert message inform the triggering action

Browse Source
This commit is contained in:
rhian-cs
2021-06-08 17:46:35 -03:00
committed by Javi Martín
parent e45ae0d7a1
commit b27a05cbfd
13 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/components/moderation/shared/index_component.html.erb
View File

@@ -21,18 +21,18 @@
<%= submit_tag t("moderation.#{i18n_namespace}.index.block_authors"), <%= submit_tag t("moderation.#{i18n_namespace}.index.block_authors"),
name: "block_authors", name: "block_authors",
class: "button hollow alert", class: "button hollow alert",
data: { confirm: t("moderation.#{i18n_namespace}.index.confirm") } %> data: { confirm: t("moderation.actions.confirm_action", action: t("moderation.#{i18n_namespace}.index.block_authors")) } %>
<div class="float-right"> <div class="float-right">
<%= submit_tag t("moderation.#{i18n_namespace}.index.hide"), <%= submit_tag t("moderation.#{i18n_namespace}.index.hide"),
name: "hide_#{table_name}", name: "hide_#{table_name}",
class: "button hollow alert", class: "button hollow alert",
data: { confirm: t("moderation.#{i18n_namespace}.index.confirm") } %> data: { confirm: t("moderation.actions.confirm_action", action: t("moderation.#{i18n_namespace}.index.hide")) } %>
<%= submit_tag t("moderation.#{i18n_namespace}.index.ignore_flags"), <%= submit_tag t("moderation.#{i18n_namespace}.index.ignore_flags"),
name: "ignore_flags", name: "ignore_flags",
class: "button hollow", class: "button hollow",
data: { confirm: t("moderation.#{i18n_namespace}.index.confirm") } %> data: { confirm: t("moderation.actions.confirm_action", action: t("moderation.#{i18n_namespace}.index.ignore_flags")) } %>
</div> </div>
<%= paginate records %> <%= paginate records %>

2
app/views/admin/poll/questions/answers/images/index.html.erb
View File

@@ -18,6 +18,6 @@
class: "delete float-right", class: "delete float-right",
method: :delete, method: :delete,
remote: true, remote: true,
data: { confirm: t("admin.actions.confirm") } %> data: { confirm: t("admin.actions.confirm_action", action: t("images.remove_image"), name: image.title) } %>
</div> </div>
<% end %> <% end %>

4
app/views/budgets/investments/_actions.html.erb
View File

@@ -1,10 +1,10 @@
<% if can? :hide, investment %> <% if can? :hide, investment %>
<%= link_to t("admin.actions.hide").capitalize, hide_moderation_budget_investment_path(investment), <%= link_to t("admin.actions.hide").capitalize, hide_moderation_budget_investment_path(investment),
method: :put, remote: true, data: { confirm: t("admin.actions.confirm") } %> method: :put, remote: true, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.hide"), name: investment.title) } %>
<% end %> <% end %>
<% if can? :hide, investment.author %> <% if can? :hide, investment.author %>
&nbsp;|&nbsp; &nbsp;|&nbsp;
<%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(investment.author_id), <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(investment.author_id),
method: :put, data: { confirm: t("admin.actions.confirm") } %> method: :put, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.hide_author"), name: investment.author.name) } %>
<% end %> <% end %>

4
app/views/comments/_actions.html.erb
View File

@@ -12,13 +12,13 @@
data: { confirm: t("comments.actions.confirm_delete") } %> data: { confirm: t("comments.actions.confirm_delete") } %>
<% else %> <% else %>
<%= link_to t("admin.actions.hide").capitalize, hide_moderation_comment_path(comment), <%= link_to t("admin.actions.hide").capitalize, hide_moderation_comment_path(comment),
method: :put, remote: true, data: { confirm: t("admin.actions.confirm") } %> method: :put, remote: true, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.hide"), name: comment.body.truncate(32)) } %>
<% end %> <% end %>
<% end %> <% end %>
<% if can? :hide, comment.user %> <% if can? :hide, comment.user %>
<span class="divider">&nbsp;&bull;&nbsp;</span> <span class="divider">&nbsp;&bull;&nbsp;</span>
<%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(comment.user_id), <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(comment.user_id),
method: :put, data: { confirm: t("admin.actions.confirm") } %> method: :put, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.hide_author"), name: comment.author.name) } %>
<% end %> <% end %>
</span> </span>

8
app/views/debates/_actions.html.erb
View File

@@ -1,21 +1,21 @@
<% if can? :hide, debate %> <% if can? :hide, debate %>
<%= link_to t("admin.actions.hide").capitalize, hide_moderation_debate_path(debate), <%= link_to t("admin.actions.hide").capitalize, hide_moderation_debate_path(debate),
method: :put, remote: true, data: { confirm: t("admin.actions.confirm") } %> method: :put, remote: true, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.hide"), name: debate.title) } %>
<% end %> <% end %>
<% if can? :hide, debate.author %> <% if can? :hide, debate.author %>
&nbsp;|&nbsp; &nbsp;|&nbsp;
<%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(debate.author_id), <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(debate.author_id),
method: :put, data: { confirm: t("admin.actions.confirm") } %> method: :put, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.hide_author"), name: debate.author.name) } %>
<% end %> <% end %>
<% if can? :mark_featured, debate %> <% if can? :mark_featured, debate %>
&nbsp;|&nbsp; &nbsp;|&nbsp;
<% if debate.featured? %> <% if debate.featured? %>
<%= link_to t("admin.actions.unmark_featured").capitalize, unmark_featured_debate_path(debate), <%= link_to t("admin.actions.unmark_featured").capitalize, unmark_featured_debate_path(debate),
method: :put, data: { confirm: t("admin.actions.confirm") } %> method: :put, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.unmark_featured"), name: debate.title) } %>
<% else %> <% else %>
<%= link_to t("admin.actions.mark_featured").capitalize, mark_featured_debate_path(debate), <%= link_to t("admin.actions.mark_featured").capitalize, mark_featured_debate_path(debate),
method: :put, data: { confirm: t("admin.actions.confirm") } %> method: :put, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.mark_featured"), name: debate.title) } %>
<% end %> <% end %>
<% end %> <% end %>

4
app/views/legislation/proposals/_actions.html.erb
View File

@@ -1,10 +1,10 @@
<% if can? :hide, proposal %> <% if can? :hide, proposal %>
<%= link_to t("admin.actions.hide").capitalize, hide_moderation_legislation_proposal_path(proposal), <%= link_to t("admin.actions.hide").capitalize, hide_moderation_legislation_proposal_path(proposal),
method: :put, remote: true, data: { confirm: t("admin.actions.confirm") } %> method: :put, remote: true, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.hide"), name: proposal.title) } %>
<% end %> <% end %>
<% if can? :hide, proposal.author %> <% if can? :hide, proposal.author %>
&nbsp;|&nbsp; &nbsp;|&nbsp;
<%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(proposal.author_id), <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(proposal.author_id),
method: :put, data: { confirm: t("admin.actions.confirm") } %> method: :put, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.hide_author"), name: proposal.author.name) } %>
<% end %> <% end %>

4
app/views/proposal_notifications/_actions.html.erb
View File

@@ -3,13 +3,13 @@
<span class="js-moderation-actions"> <span class="js-moderation-actions">
<% if can? :hide, notification %> <% if can? :hide, notification %>
<%= link_to t("admin.actions.hide").capitalize, hide_moderation_proposal_notification_path(notification), <%= link_to t("admin.actions.hide").capitalize, hide_moderation_proposal_notification_path(notification),
method: :put, remote: true, data: { confirm: t("admin.actions.confirm") } %> method: :put, remote: true, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.hide"), name: notification.title) } %>
<% end %> <% end %>
<% if can? :hide, notification.author %> <% if can? :hide, notification.author %>
<span class="divider">&nbsp;&bull;&nbsp;</span> <span class="divider">&nbsp;&bull;&nbsp;</span>
<%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(notification.author_id), <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(notification.author_id),
method: :put, data: { confirm: t("admin.actions.confirm") } %> method: :put, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.hide_author"), name: notification.author.name) } %>
<% end %> <% end %>
</span> </span>
</div> </div>

4
app/views/proposals/_actions.html.erb
View File

@@ -1,10 +1,10 @@
<% if can? :hide, proposal %> <% if can? :hide, proposal %>
<%= link_to t("admin.actions.hide").capitalize, hide_moderation_proposal_path(proposal), <%= link_to t("admin.actions.hide").capitalize, hide_moderation_proposal_path(proposal),
method: :put, remote: true, data: { confirm: t("admin.actions.confirm") } %> method: :put, remote: true, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.hide"), name: proposal.title) } %>
<% end %> <% end %>
<% if can? :hide, proposal.author %> <% if can? :hide, proposal.author %>
&nbsp;|&nbsp; &nbsp;|&nbsp;
<%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(proposal.author_id), <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(proposal.author_id),
method: :put, data: { confirm: t("admin.actions.confirm") } %> method: :put, data: { confirm: t("admin.actions.confirm_action", action: t("admin.actions.hide_author"), name: proposal.author.name) } %>
<% end %> <% end %>

1
config/locales/en/admin.yml
View File

@@ -4,7 +4,6 @@ en:
title: Administration title: Administration
actions: actions:
actions: Actions actions: Actions
confirm: Are you sure?
confirm_action: "Are you sure? %{action} \"%{name}\"" confirm_action: "Are you sure? %{action} \"%{name}\""
confirm_delete: "Are you sure? This action will delete \"%{name}\" and can't be undone." confirm_delete: "Are you sure? This action will delete \"%{name}\" and can't be undone."
confirm_hide: Confirm moderation confirm_hide: Confirm moderation

7
config/locales/en/moderation.yml
View File

@@ -1,9 +1,10 @@
en: en:
moderation: moderation:
actions:
confirm_action: "Are you sure? %{action}"
comments: comments:
index: index:
block_authors: Block authors block_authors: Block authors
confirm: Are you sure?
filter: Filter filter: Filter
filters: filters:
all: All all: All
@@ -24,7 +25,6 @@ en:
debates: debates:
index: index:
block_authors: Block authors block_authors: Block authors
confirm: Are you sure?
filter: Filter filter: Filter
filters: filters:
all: All all: All
@@ -51,7 +51,6 @@ en:
proposals: proposals:
index: index:
block_authors: Block authors block_authors: Block authors
confirm: Are you sure?
filter: Filter filter: Filter
filters: filters:
all: All all: All
@@ -69,7 +68,6 @@ en:
budget_investments: budget_investments:
index: index:
block_authors: Block authors block_authors: Block authors
confirm: Are you sure?
filter: Filter filter: Filter
filters: filters:
all: All all: All
@@ -87,7 +85,6 @@ en:
proposal_notifications: proposal_notifications:
index: index:
block_authors: Block authors block_authors: Block authors
confirm: Are you sure?
filter: Filter filter: Filter
filters: filters:
all: All all: All

1
config/locales/es/admin.yml
View File

@@ -4,7 +4,6 @@ es:
title: Administración title: Administración
actions: actions:
actions: Acciones actions: Acciones
confirm: '¿Estás seguro?'
confirm_action: "¿Estás seguro? %{action} \"%{name}\"" confirm_action: "¿Estás seguro? %{action} \"%{name}\""
confirm_delete: "¿Estás seguro? Esta acción borrará \"%{name}\" y no se puede deshacer." confirm_delete: "¿Estás seguro? Esta acción borrará \"%{name}\" y no se puede deshacer."
confirm_hide: Confirmar moderación confirm_hide: Confirmar moderación

7
config/locales/es/moderation.yml
View File

@@ -1,9 +1,10 @@
es: es:
moderation: moderation:
actions:
confirm_action: "¿Estás seguro? %{action}"
comments: comments:
index: index:
block_authors: Bloquear autores block_authors: Bloquear autores
confirm: '¿Estás seguro?'
filter: Filtro filter: Filtro
filters: filters:
all: Todos all: Todos
@@ -24,7 +25,6 @@ es:
debates: debates:
index: index:
block_authors: Bloquear autores block_authors: Bloquear autores
confirm: '¿Estás seguro?'
filter: Filtrar filter: Filtrar
filters: filters:
all: Todos all: Todos
@@ -51,7 +51,6 @@ es:
proposals: proposals:
index: index:
block_authors: Bloquear autores block_authors: Bloquear autores
confirm: '¿Estás seguro?'
filter: Filtro filter: Filtro
filters: filters:
all: Todas all: Todas
@@ -69,7 +68,6 @@ es:
budget_investments: budget_investments:
index: index:
block_authors: Bloquear autores block_authors: Bloquear autores
confirm: '¿Estás seguro?'
filter: Filtro filter: Filtro
filters: filters:
all: Todos all: Todos
@@ -87,7 +85,6 @@ es:
proposal_notifications: proposal_notifications:
index: index:
block_authors: Bloquear autores block_authors: Bloquear autores
confirm: '¿Estás seguro?'
filter: Filtro filter: Filtro
filters: filters:
all: Todas all: Todas

2
spec/system/admin/poll/questions/answers/images/images_spec.rb
View File

@@ -53,7 +53,7 @@ describe "Images", :admin do
expect(page).to have_css("img[title='#{image.title}']") expect(page).to have_css("img[title='#{image.title}']")
expect(page).to have_content(image.title) expect(page).to have_content(image.title)
accept_confirm "Are you sure?" do accept_confirm "Are you sure? Remove image \"#{image.title}\"" do
click_link "Remove image" click_link "Remove image"
end end