IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: handles different cases of canInvite/canRemove states in PM (#10607)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2020-09-08 16:35:59 +02:00 committed by GitHub
parent 2c66698470
commit 8413d27cf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/javascripts/discourse/app/widgets/private-message-map.js
View File

@ -158,15 +158,25 @@ export default createWidget("private-message-map", {
const result = [h(`div.participants${hideNamesClass}`, participants)]; const result = [h(`div.participants${hideNamesClass}`, participants)];
const controls = []; const controls = [];
if ( const canRemove = attrs.canRemoveAllowedUsers || attrs.canRemoveSelfId;
attrs.canInvite ||
attrs.canRemoveAllowedUsers || if (attrs.canInvite || canRemove) {
attrs.canRemoveSelfId let key;
) { let action = "toggleEditing";
if (attrs.canInvite && canRemove) {
key = "edit";
} else if (!attrs.canInvite && canRemove) {
key = "remove";
} else {
key = "add";
action = "showInvite";
}
controls.push( controls.push(
this.attach("button", { this.attach("button", {
action: "toggleEditing", action,
label: "private_message_info.edit", label: `private_message_info.${key}`,
className: "btn btn-default add-remove-participant-btn", className: "btn btn-default add-remove-participant-btn",
}) })
); );

2
config/locales/client.en.yml
View File

@ -1586,6 +1586,8 @@ en:
title: "Message" title: "Message"
invite: "Invite Others ..." invite: "Invite Others ..."
edit: "Add or Remove ..." edit: "Add or Remove ..."
remove: "Remove ..."
add: "Add ..."
leave_message: "Do you really want to leave this message?" leave_message: "Do you really want to leave this message?"
remove_allowed_user: "Do you really want to remove %{name} from this message?" remove_allowed_user: "Do you really want to remove %{name} from this message?"
remove_allowed_group: "Do you really want to remove %{name} from this message?" remove_allowed_group: "Do you really want to remove %{name} from this message?"