diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-07-10 14:04:15 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-07-10 14:10:04 -0400 |
| commit | 99565bb6bd87cfc46591cea73985c58c3a3697dd (patch) | |
| tree | 3d90220524af46b157a3fc9d7c555c711452c139 /ecomp-portal-BE-common/src/main/webapp | |
| parent | fec1ab242c9086a32b04e3ded4518dd20eeca7d3 (diff) | |
[PORTAL-20,PORTAL-23,PORTAL-32] Repair defects
PORTAL-20: remove mariadb client reference from be-common pom
PORTAL-23: Release Portal's SDK version 1.1.0
PORTAL-32: API URL correction for onboarded Apps
Change-Id: If75b54ca9202f94ce63c59343b94384da1040912
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-portal-BE-common/src/main/webapp')
| -rw-r--r-- | ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml index 84f7b7ed..eea9467a 100644 --- a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml +++ b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml @@ -630,13 +630,13 @@ and a.is_for_all_roles = 'N' ) a, ( - select a.user_id, c.role_id, c.app_id, d.APP_NAME + select distinct a.user_id, c.role_id, c.app_id, d.APP_NAME from fn_user a, fn_user_role b, fn_role c, fn_app d - where a.user_id = b.user_id + where COALESCE(c.app_id,1) = d.app_id + and a.user_id = b.user_id and a.user_id = :user_id and b.role_id = c.role_id - and c.app_id = d.app_id - and d.enabled='Y' + and (d.enabled='Y' or d.app_id=1) )b where ( @@ -821,13 +821,13 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name ) ) a, ( - select a.user_id, c.role_id, c.app_id, d.APP_NAME + select distinct a.user_id, c.role_id, c.app_id, d.APP_NAME from fn_user a, fn_user_role b, fn_role c, fn_app d - where a.user_id = b.user_id + where COALESCE(c.app_id,1) = d.app_id + and a.user_id = b.user_id and a.user_id = :user_id and b.role_id = c.role_id - and c.app_id = d.app_id - and d.enabled='Y' + and (d.enabled='Y' or d.app_id=1) ) b where ( |