maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add tag moderators by username w/o autocomplete (#20767)

Browse source
This commit is contained in:
Anna Buianova 2024-03-15 21:15:51 +03:00 • committed by GitHub
parent 57c0078bd6
commit 53f311b059
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/admin/tags/moderators_controller.rb
View file

@ -10,11 +10,11 @@ module Admin
end
def create
user = User.find_by(id: tag_params[:user_id])
user = User.find_by(username: tag_params[:username])
unless user
flash[:error] =
I18n.t("errors.messages.general",
errors: I18n.t("admin.tags.moderators_controller.not_found", user_id: tag_params[:user_id]))
errors: I18n.t("admin.tags.moderators_controller.not_found", username: tag_params[:username]))
return redirect_to edit_admin_tag_path(params[:tag_id])
end
@ -26,7 +26,7 @@ module Admin
else
flash[:error] = I18n.t("errors.messages.general", errors:
I18n.t("admin.tags.moderators_controller.not_found_or",
user_id: tag_params[:user_id],
user_id: user.id,
errors: notification_setting.errors_as_sentence))
end
redirect_to edit_admin_tag_path(params[:tag_id])
@ -58,7 +58,7 @@ module Admin
private
def tag_params
params.require(:tag).permit(:user_id)
params.require(:tag).permit(:username, :user_id)
end
end
end

4
app/views/admin/tags/edit.html.erb
View file

@ -15,9 +15,9 @@
<div class="flex flex-col gap-2">
<%= form_with url: admin_tag_moderator_path(@tag.id), model: [:admin, @tag], method: :post, local: true do |f| %>
<div class="crayons-field w-50 my-4">
<%= f.label :user_id, "Add Moderator:", class: "crayons-field__label" %>
<%= f.label :username, "Add Moderator:", class: "crayons-field__label" %>
<div>
<%= f.text_field :user_id, class: "crayons-textfield js-username_id_input" %>
<%= f.text_field :username, class: "crayons-textfield js-username_input", placeholder: "username" %>
</div>
<%= f.submit "Add Moderator", class: "crayons-btn" %>
</div>

5
app/views/admin/users/show/overview/_tag_moderation.html.erb
View file

@ -25,6 +25,7 @@
</ul>
<% end %>
<div id="tag-moderation-description" class="crayons-notice crayons-notice--warning">
<%= t("views.admin.users.overview.tag_mod.notice_html", tag_page: link_to(t("views.admin.users.overview.tag_mod.tag_page"), admin_tags_path, class: "c-link c-link--branded"), user_id: tag.strong(@user.id)) %>
<div id="tag-moderation-description" class="crayons-notice crayons-notice--warning mt-4">
<%= t("views.admin.users.overview.tag_mod.notice_html", tag_page: link_to(t("views.admin.users.overview.tag_mod.tag_page"),
admin_tags_path, class: "c-link c-link--branded"), username: tag.strong(@user.username)) %>
</div>

2
config/locales/controllers/admin/en.yml
View file

@ -112,7 +112,7 @@ en:
update_success: Space has been updated.
tags:
moderators_controller:
not_found: 'User ID #%{user_id} was not found'
not_found: 'Username "%{username}" was not found'
not_found_or: 'User ID #%{user_id} was not found, or their account has errors: %{errors}'
removed: '@%{username} - ID #%{user_id} was removed as a tag moderator.'
added: '%{username} was added as a tag moderator!'

2
config/locales/controllers/admin/fr.yml
View file

@ -112,7 +112,7 @@ fr:
update_success: L'espace a été mis à jour.
tags:
moderators_controller:
not_found: "L'ID utilisateur #%{user_id} n'a pas été trouvé"
not_found: "Le nom d'utilisateur %{username} n'a pas été trouvé"
not_found_or: "L'identifiant de l'utilisateur #%{user_id} n'a pas été trouvé, ou son compte présente des erreurs : %{errors}"
removed: "@%{username} - ID #%{user_id} a été supprimé en tant que modérateur de tags."
added: "%{username} a été ajouté en tant que modérateur de tags !"

2
config/locales/views/admin/en.yml
View file

@ -324,7 +324,7 @@ en:
icon: Mod
desc: "Add a tag that this member can moderate. "
remove: "Remove tag:"
notice_html: Adding tags for moderation is currently only possible through a particular %{tag_page}, by providing the user's ID (%{user_id}).
notice_html: Adding tags for moderation is currently only possible through a particular %{tag_page}, by providing the username (%{username}).
tag_page: tag's page
priviliged_actions:
description: The user flags affect the scores of articles and comments. Each valid or open user flag further reduces the score of the article and comment.

2
config/locales/views/admin/fr.yml
View file

@ -322,7 +322,7 @@ fr:
icon: Mod
desc: "Add a tag that this member can moderate. "
remove: "Remove tag:"
notice_html: Adding tags for moderation is currently only possible through a particular %{tag_page}, by providing the user's ID (%{user_id}).
notice_html: Adding tags for moderation is currently only possible through a particular %{tag_page}, by providing the username (%{username}).
tag_page: tag's page
priviliged_actions:
description: The user flags affect the scores of articles and comments. Each valid or open user flag further reduces the score of the article and comment.

11
spec/requests/admin/tags/moderators_spec.rb
View file

@ -8,12 +8,19 @@ RSpec.describe "/admin/content_manager/tags/:id/moderator" do
describe "POST /admin/content_manager/tags/:id/moderator" do
before { sign_in super_admin }
it "adds the given user as trusted and as a tag moderator" do
post admin_tag_moderator_path(tag.id), params: { tag_id: tag.id, tag: { user_id: user.id } }
it "adds the given user as trusted and as a tag moderator by username" do
post admin_tag_moderator_path(tag.id), params: { tag_id: tag.id, tag: { username: user.username } }
expect(user.tag_moderator?).to be true
expect(user.trusted?).to be true
end
it "redirects to edit with not_found message when there is no such username" do
post admin_tag_moderator_path(tag.id), params: { tag_id: tag.id, tag: { username: "any_username" } }
expect(response).to redirect_to(edit_admin_tag_path(tag.id))
expect(flash[:error]).to include("Username \"any_username\" was not found")
end
end
describe "DELETE /admin/content_manager/tags/:id/moderator" do