#605 Apply filter by module to other Module Items

meveo-org · Nov 21, 2022 · 0d3dfbe · 0d3dfbe
1 parent f0e8519
commit 0d3dfbe
Show file tree

Hide file tree

Showing 12 changed files with 95 additions and 0 deletions.
diff --git a/meveo-admin-web/src/main/java/org/meveo/admin/action/admin/endpoint/WebsocketClientBean.java b/meveo-admin-web/src/main/java/org/meveo/admin/action/admin/endpoint/WebsocketClientBean.java
@@ -3,6 +3,7 @@
  */
 package org.meveo.admin.action.admin.endpoint;
 
+import javax.annotation.PostConstruct;
 import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -37,6 +38,13 @@ public class WebsocketClientBean extends BaseCrudBean<WebsocketClient, Websocket
 	public WebsocketClientBean() {
 		super(WebsocketClient.class); 
 	}
+
+	@PostConstruct
+	@Override
+    public void init() {
+		super.init();
+        this.filters.put("moduleBelonging", this.getUserCurrentModule());
+    }
 
 	@Override
 	public BaseCrudApi<WebsocketClient, WebsocketClientDto> getBaseCrudApi() {

diff --git a/meveo-admin-web/src/main/java/org/meveo/admin/action/admin/endpoint/WsEndpointListBean.java b/meveo-admin-web/src/main/java/org/meveo/admin/action/admin/endpoint/WsEndpointListBean.java
@@ -1,5 +1,6 @@
 package org.meveo.admin.action.admin.endpoint;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.ConversationScoped;
 import javax.inject.Named;
 
@@ -11,4 +12,10 @@
 @ConversationScoped
 public class WsEndpointListBean extends WsEndpointBean {
 
+    @PostConstruct
+	@Override
+    public void init() {
+		super.init();
+        this.filters.put("moduleBelonging", this.getUserCurrentModule());
+    }
 }
diff --git a/...dmin-web/src/main/java/org/meveo/admin/action/notification/EmailNotificationListBean.java b/...dmin-web/src/main/java/org/meveo/admin/action/notification/EmailNotificationListBean.java
@@ -18,6 +18,7 @@
  */
 package org.meveo.admin.action.notification;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.ConversationScoped;
 import javax.inject.Named;
 
@@ -26,4 +27,11 @@
 public class EmailNotificationListBean extends EmailNotificationBean {
 
     private static final long serialVersionUID = -3037867704912788042L;
+
+    @PostConstruct
+	@Override
+    public void init() {
+		super.init();
+        this.filters.put("moduleBelonging", this.getUserCurrentModule());
+    }
 }
diff --git a/...o-admin-web/src/main/java/org/meveo/admin/action/notification/InboundRequestListBean.java b/...o-admin-web/src/main/java/org/meveo/admin/action/notification/InboundRequestListBean.java
@@ -18,6 +18,7 @@
  */
 package org.meveo.admin.action.notification;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.ConversationScoped;
 import javax.inject.Named;
 
@@ -26,4 +27,11 @@
 public class InboundRequestListBean extends InboundRequestBean {
 
     private static final long serialVersionUID = -3037867704912788043L;
+
+    @PostConstruct
+	@Override
+    public void init() {
+		super.init();
+        this.filters.put("moduleBelonging", this.getUserCurrentModule());
+    }
 }
diff --git a/meveo-admin-web/src/main/java/org/meveo/admin/action/notification/JobTriggerListBean.java b/meveo-admin-web/src/main/java/org/meveo/admin/action/notification/JobTriggerListBean.java
@@ -18,6 +18,7 @@
  */
 package org.meveo.admin.action.notification;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.ConversationScoped;
 import javax.inject.Named;
 
@@ -26,4 +27,11 @@
 public class JobTriggerListBean extends JobTriggerBean {
 
     private static final long serialVersionUID = -3037867704912788045L;
+
+    @PostConstruct
+	@Override
+    public void init() {
+		super.init();
+        this.filters.put("moduleBelonging", this.getUserCurrentModule());
+    }
 }
diff --git a/...-admin-web/src/main/java/org/meveo/admin/action/notification/NotificationHistoryBean.java b/...-admin-web/src/main/java/org/meveo/admin/action/notification/NotificationHistoryBean.java
@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.annotation.PostConstruct;
 import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -54,6 +55,13 @@ public NotificationHistoryBean() {
 		super(NotificationHistory.class);
 	}
 
+	@PostConstruct
+	@Override
+    public void init() {
+		super.init();
+        this.filters.put("moduleBelonging", this.getUserCurrentModule());
+    }
+
 	@Override
 	protected IPersistenceService<NotificationHistory> getPersistenceService() {
 		return notificationHistoryService;

diff --git a/meveo-admin-web/src/main/java/org/meveo/admin/action/notification/NotificationListBean.java b/meveo-admin-web/src/main/java/org/meveo/admin/action/notification/NotificationListBean.java
@@ -18,6 +18,7 @@
  */
 package org.meveo.admin.action.notification;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.ConversationScoped;
 import javax.inject.Named;
 
@@ -26,4 +27,11 @@
 public class NotificationListBean extends NotificationBean {
 
     private static final long serialVersionUID = -3037867704912788045L;
+
+    @PostConstruct
+	@Override
+    public void init() {
+		super.init();
+        this.filters.put("moduleBelonging", this.getUserCurrentModule());
+    }
 }
diff --git a/meveo-admin-web/src/main/java/org/meveo/admin/action/notification/WebHookListBean.java b/meveo-admin-web/src/main/java/org/meveo/admin/action/notification/WebHookListBean.java
@@ -18,6 +18,7 @@
  */
 package org.meveo.admin.action.notification;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.ConversationScoped;
 import javax.inject.Named;
 
@@ -26,4 +27,11 @@
 public class WebHookListBean extends WebHookBean {
 
     private static final long serialVersionUID = -3037867704912788046L;
+
+    @PostConstruct
+	@Override
+    public void init() {
+		super.init();
+        this.filters.put("moduleBelonging", this.getUserCurrentModule());
+    }
 }
diff --git a/...-admin-web/src/main/java/org/meveo/admin/action/notification/WebNotificationListBean.java b/...-admin-web/src/main/java/org/meveo/admin/action/notification/WebNotificationListBean.java
@@ -1,5 +1,6 @@
 package org.meveo.admin.action.notification;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.ConversationScoped;
 import javax.inject.Named;
 
@@ -13,4 +14,11 @@ public class WebNotificationListBean extends WebNotificationBean {
 
 	private static final long serialVersionUID = -7160105377348715515L;
 
+	@PostConstruct
+	@Override
+    public void init() {
+		super.init();
+        this.filters.put("moduleBelonging", this.getUserCurrentModule());
+    }
+
 }
diff --git a/meveo-admin-web/src/main/java/org/meveo/admin/action/wf/WorkflowListBean.java b/meveo-admin-web/src/main/java/org/meveo/admin/action/wf/WorkflowListBean.java
@@ -18,6 +18,7 @@
  */
 package org.meveo.admin.action.wf;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.ConversationScoped;
 import javax.inject.Named;
 
@@ -26,4 +27,11 @@
 public class WorkflowListBean extends WorkflowBean {
 
     private static final long serialVersionUID = -3037867704912788052L;
+
+    @PostConstruct
+	@Override
+    public void init() {
+		super.init();
+        this.filters.put("moduleBelonging", this.getUserCurrentModule());
+    }
 }
diff --git a/meveo-admin-web/src/main/java/org/meveo/services/job/JobInstanceBean.java b/meveo-admin-web/src/main/java/org/meveo/services/job/JobInstanceBean.java
@@ -2,6 +2,7 @@
 
 import java.util.*;
 
+import javax.annotation.PostConstruct;
 import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -62,6 +63,13 @@ public JobInstanceBean() {
         super(JobInstance.class);
     }
 
+    @PostConstruct
+	@Override
+    public void init() {
+		super.init();
+        this.filters.put("moduleBelonging", this.getUserCurrentModule());
+    }
+
     @Override
     public JobInstance initEntity() {
         entity = super.initEntity();

diff --git a/meveo-admin-web/src/main/java/org/meveo/services/job/TimerEntityListBean.java b/meveo-admin-web/src/main/java/org/meveo/services/job/TimerEntityListBean.java
@@ -1,5 +1,6 @@
 package org.meveo.services.job;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.ConversationScoped;
 import javax.inject.Named;
 
@@ -12,4 +13,11 @@ public class TimerEntityListBean extends TimerEntityBean {
      */
     private static final long serialVersionUID = 291083155570451308L;
 
+    @PostConstruct
+	@Override
+    public void init() {
+		super.init();
+        this.filters.put("moduleBelonging", this.getUserCurrentModule());
+    }
+
 }