github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-26 21:44:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Allow pasting invitees in invite modal (#12520)

Browse Source 
Meta topic: https://meta.discourse.org/t/pasting-email-in-share-a-thread-box-stopped-working/180919?u=osama.
This commit is contained in:
Osama Sayegh 2021-03-25 16:24:40 +03:00 committed by GitHub
parent f74785f758
commit c028745468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/components/invite-panel.js
View File

@ -468,7 +468,11 @@ export default Component.extend({
@action @action
updateInvitee(selected, content) { updateInvitee(selected, content) {
const invitee = content.findBy("id", selected[0]); let invitee = content.findBy("id", selected[0]);
if (!invitee && content.length) {
invitee =
typeof content[0] === "string" ? { id: content[0] } : content[0];
}
if (invitee) { if (invitee) {
this.setProperties({ this.setProperties({
invitee: invitee.id.trim(), invitee: invitee.id.trim(),

1
app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs
View File

@ -28,6 +28,7 @@
excludeCurrentUser=true excludeCurrentUser=true
includeMessageableGroups=isPM includeMessageableGroups=isPM
filterPlaceholder=placeholderKey filterPlaceholder=placeholderKey
fullWidthWrap=true
) )
}} }}
{{else}} {{else}}

14
app/assets/stylesheets/common/components/share-and-invite-modal.scss
View File

@ -76,10 +76,6 @@
margin-bottom: 8px; margin-bottom: 8px;
} }
.invite-user-control input.email-or-username-input {
line-height: 1.75em;
}
.group-access-control { .group-access-control {
.select-kit.multi-select input.filter-input { .select-kit.multi-select input.filter-input {
padding-left: 8px; padding-left: 8px;
@ -98,8 +94,16 @@
color: var(--secondary-medium); color: var(--secondary-medium);
} }
.email-or-username-input { .invite-user-input {
width: 100%; width: 100%;
.input-wrapper {
width: 100%;
.filter-input {
width: 100%;
}
}
} }
.max-redemptions-allowed { .max-redemptions-allowed {