Fix avatars of users in guest sytem messages #1240
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nickvergessen
force-pushed
the
bugfix/noid/avatar-on-mentions-from-guests
branch
from
44fadd7 to
f7924a9
Compare
nickvergessen
force-pushed
the
bugfix/noid/avatar-on-mentions-from-guests
branch
2 times, most recently
from
c2566ea to
c23098d
Compare
Member
Author
|
Rebased and fixed the avatars in the message compose field. Please test @danxuliu |
danxuliu
requested changes
Nov 9, 2018
Member
There was a problem hiding this comment.
This breaks creating new mentions (although only when sending the message after selecting the user in the auto complete menu, which is not covered by the acceptance tests due to how the auto complete menu is triggered and how Selenium/Mink types text in an input field :-( ).
I will take over this.
When its first parameter is undefined the "avatar()" function gets the user id from the "data-user" attribute, so now the user id must be given explicitly. Signed-off-by: Daniel Calviño Sánchez <[email protected]>
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
The model holds the data for the message author, but it is not applicable when setting the avatar for mentions, as in that case each mention has its own user data. Signed-off-by: Joas Schilling <[email protected]>
Signed-off-by: Joas Schilling <[email protected]>
danxuliu
force-pushed
the
bugfix/noid/avatar-on-mentions-from-guests
branch
from
c23098d to
78c1fae
Compare
danxuliu
approved these changes
Nov 9, 2018
Member
danxuliu
left a comment
danxuliu
left a comment
There was a problem hiding this comment.
Fixed; tested and works 👍 (although I should not approve myself... :-P )
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The avatar always has to use the data from the avatar element and never from the message actor.