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

fix: [BUG] Invitation to join space : notification is never updated - EXO-75048 - Meeds-io/meeds#2531 #4136

Closed
wants to merge 6 commits into from
Closed

fix: [BUG] Invitation to join space : notification is never updated - EXO-75048 - Meeds-io/meeds#2531 #4136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
985ae7c
Create FB feature/maintenance and update projects versions/dependencies
halaya Apr 29, 2024
f443e4e
fix: Profile attributes administration filter doesn't work - EXO-7139…
akhanfir May 7, 2024
e20da20
fix: [BUG] Unlimit the number of spaces to display in the External sp…
mkrout May 23, 2024
e5e5dd6
fix: Profile attributes administration filter doesn't work - EXO-7139…
akhanfir May 7, 2024
eae2ce2
fix: [BUG] Unlimit the number of spaces to display in the External sp…
mkrout May 23, 2024
283b142
fix: [BUG] Invitation to join space : notification is never updated -…
mkrout Oct 28, 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: 1 addition & 1 deletion component/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
</parent>
<artifactId>social-component-api</artifactId>
<name>Meeds:: PLF:: Social API</name>
Expand Down
2 changes: 1 addition & 1 deletion component/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
</parent>
<groupId>io.meeds.social</groupId>
<artifactId>social-component-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion component/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
</parent>
<artifactId>social-component-core</artifactId>
<name>Meeds:: PLF:: Social Core Component</name>
Expand Down
2 changes: 1 addition & 1 deletion component/notification/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
</parent>
<artifactId>social-component-notification</artifactId>
<name>Meeds:: PLF:: Social Notification Component</name>
Expand Down
3 changes: 2 additions & 1 deletion ...ication/src/main/java/org/exoplatform/social/notification/impl/SpaceNotificationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.exoplatform.social.notification.impl;

import org.apache.commons.lang3.StringUtils;
import org.exoplatform.commons.api.notification.NotificationContext;
import org.exoplatform.commons.api.notification.model.*;
import org.exoplatform.commons.api.notification.plugin.BaseNotificationPlugin;
Expand Down Expand Up @@ -126,7 +127,7 @@ private void updateNotificationsStatus(Space space, String from, String to, Stri
webNotificationFilter.setPluginKey(new PluginKey(pluginId));
List<NotificationInfo> webNotifs = getWebNotificationService().getNotificationInfos(webNotificationFilter, 0, -1);
for (NotificationInfo info : webNotifs) {
if (info.getTo().equals(to) && info.getFrom().equals(from) && !"accepted".equals(info.getOwnerParameter().get("status"))) {
if (info.getTo().equals(to) && (StringUtils.isEmpty(info.getFrom()) || info.getFrom().equals(from)) && !"accepted".equals(info.getOwnerParameter().get("status"))) {
//one element has changed, we need to update
info.setTo(to);
info.setFrom(from);
Expand Down
2 changes: 1 addition & 1 deletion component/oauth-auth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion component/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>social</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
</parent>
<artifactId>social-component</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion component/service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
</parent>
<artifactId>social-component-service</artifactId>
<name>Meeds:: PLF:: Social Service Component</name>
Expand Down
2 changes: 1 addition & 1 deletion component/web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
</parent>
<groupId>io.meeds.social</groupId>
<artifactId>social-component-web</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>social</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
</parent>
<artifactId>social-extension</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion extension/war/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>social-extension</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
</parent>
<artifactId>social-extension-war</artifactId>
<packaging>war</packaging>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</parent>
<groupId>io.meeds.social</groupId>
<artifactId>social</artifactId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Meeds:: PLF:: Social</name>
<description>Meeds Social - Enterprise Social Networking</description>
Expand All @@ -46,8 +46,8 @@
<!-- **************************************** -->
<!-- Project Dependencies -->
<!-- **************************************** -->
<io.meeds.commons.version>7.0.x-exo-SNAPSHOT</io.meeds.commons.version>
<io.meeds.platform-ui.version>7.0.x-exo-SNAPSHOT</io.meeds.platform-ui.version>
<io.meeds.commons.version>7.0.x-maintenance-SNAPSHOT</io.meeds.commons.version>
<io.meeds.platform-ui.version>7.0.x-maintenance-SNAPSHOT</io.meeds.platform-ui.version>

<!-- Sonar properties -->
<sonar.organization>meeds-io</sonar.organization>
Expand Down
2 changes: 1 addition & 1 deletion webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>social</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
</parent>
<artifactId>social-webapp</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion webapp/portlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>social-webapp</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.0.x-exo-SNAPSHOT</version>
<version>7.0.x-maintenance-SNAPSHOT</version>
</parent>
<artifactId>social-webapp-portlet</artifactId>
<packaging>war</packaging>
Expand Down
1 change: 1 addition & 0 deletions ...portlet/src/main/webapp/vue-apps/profile-settings/components/ProfileAttributeSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export default {
created() {
this.$root.$on('settings-set-filter', this.setFilter);
this.languagesData = [...this.languages].sort((a, b) => a.value.localeCompare(b.value));
this.$root.$on('settings-set-filter', this.setFilter);
},
computed: {
filteredSettings(){
Expand Down