X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-widget-ms%2Fwidget-ms%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fportalapp%2Fwidget%2Fservice%2Fimpl%2FWidgetCatalogServiceImpl.java;fp=ecomp-portal-widget-ms%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fportalapp%2Fwidget%2Fservice%2Fimpl%2FWidgetCatalogServiceImpl.java;h=51f782270aa7a7e4d8c7a98effcb62fc69048450;hb=978dbcf0a196acbafad72fe1e2478ec0e384f02f;hp=700274e243827624531c26eb319c77f3af849627;hpb=bc7350dce5b7b1dcd1c472a3922b42c4ea99809d;p=portal.git

diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java
similarity index 98%
rename from ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java
rename to ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java
index 700274e2..51f78227 100644
--- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java
+++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java
@@ -57,9 +57,12 @@ public class WidgetCatalogServiceImpl implements WidgetCatalogService {
 				.append("  ep_widget_catalog w,                                                                                                                            		   ")
 				.append("  ep_widget_catalog_role wr,                                                                                                             				   ")
 				.append("  fn_user_role ur,																																		   ")
+				.append("  fn_app app,																																		   ")
 				.append("  fn_user u                                                                                                                          					   ")
 				.append("  where                                                                                                                                            	   ")
 				.append("  w.widget_id = wr.WIDGET_ID and 																														   ")
+				.append("  ur.app_id = app.app_id and 																														   ")
+				.append("  app.enabled = 'Y' and																														   ")
 				.append("  wr.role_id = ur.role_id and      																													   ")                                                                                                            
 				.append("  ur.user_id = u.user_id and         																													   ")                                                                                                              
 				.append("  u.login_id = '" + loginName + "' and (w.all_user_flag = 'N' or w.all_user_flag is null)                                                          	   ")