Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat : Initial Letters Avatars - Merge meeds-io/MIPs#83 #462

Merged
merged 2 commits into from
Feb 13, 2024
Merged

feat : Initial Letters Avatars - Merge meeds-io/MIPs#83 #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82b675c
Feat: Add default user avatar when hover on reciever user name - MEED…
SaraBoutej Jan 22, 2024
c00c55d
feat: fix default avatar when sending kudos - MEED-3266 - Meeds-io/MI…
SaraBoutej Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions kudos-services/src/main/java/org/exoplatform/kudos/model/Kudos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public class Kudos implements Serializable {

private boolean externalReceiver;

private boolean enabledReceiver;

private String message;

private long timeInSeconds;
Expand Down
1 change: 1 addition & 0 deletions kudos-services/src/main/java/org/exoplatform/kudos/service/utils/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ public static Kudos fromEntity(KudosEntity kudosEntity) {
kudos.setExternalReceiver(receiverIdentity.getProfile() != null
&& receiverIdentity.getProfile().getProperty("external") != null
&& receiverIdentity.getProfile().getProperty("external").equals("true"));
kudos.setEnabledReceiver(receiverIdentity.isEnable() && !receiverIdentity.isDeleted());
kudos.setReceiverFullName(receiverIdentity.getProfile().getFullName());
kudos.setReceiverURL(LinkProvider.getUserProfileUri(receiverIdentity.getRemoteId()));
kudos.setReceiverAvatar(getAvatar(receiverIdentity, null));
Expand Down
3 changes: 2 additions & 1 deletion kudos-webapps/src/main/webapp/vue-app/js/Kudos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ export function registerActivityActionExtension() {
'avatar': kudos.receiverAvatar,
'position': kudos.receiverPosition,
'external': String(kudos.externalReceiver),
'enabled': String(kudos.enabledReceiver),
};
return {
key: 'NewKudosSentActivityComment.activity_kudos_title',
Expand Down Expand Up @@ -425,4 +426,4 @@ export function registerActivityActionExtension() {
}
}
});
}
}
1 change: 1 addition & 0 deletions kudos-webapps/src/main/webapp/vue-app/js/KudosIdentity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export function getIdentityDetails(urlId, type, remoteId) {
ownerDetails.username = identityDetails.username;
ownerDetails.position = identityDetails.position;
ownerDetails.external = identityDetails.external;
ownerDetails.enabled = identityDetails.enabled;
} else {
ownerDetails.notAuthorized = true;
}
Expand Down
Loading