diff options
Diffstat (limited to 'ecomp-portal-BE-os')
5 files changed, 54 insertions, 19 deletions
diff --git a/ecomp-portal-BE-os/README.md b/ecomp-portal-BE-os/README.md index 829fd86f..be584cba 100644 --- a/ecomp-portal-BE-os/README.md +++ b/ecomp-portal-BE-os/README.md @@ -17,6 +17,9 @@ https://www.eclipse.org/m2e-wtp/ Version 1.1.?, July 2017 - [Portal-30] Failed to communicate with the widget microservice: Fixed - [Portal-35] Replaced the portal logo with onap logo on the login screen. +- [Portal-40] Fix to add user roles +- [Portal-47] Fix to eliminate duplicate roles on Users page +- [Portal-45] Fix to save on an application Onboarding Version 1.1.0, July 2017 - [Portal-7] Improvements added as part of the rebasing process diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml index 1e4b4922..2cf1af23 100644 --- a/ecomp-portal-BE-os/pom.xml +++ b/ecomp-portal-BE-os/pom.xml @@ -116,15 +116,15 @@ </manifestEntries> </archive> <overlays> - <!-- specify the order in which these should be applied --> - <overlay> - <groupId>org.openecomp.ecompsdkos</groupId> - <artifactId>epsdk-app-overlay</artifactId> - </overlay> + <!-- specify the order in which these should be applied --> <overlay> <groupId>org.openecomp.portal</groupId> <artifactId>ecompportal-be-common</artifactId> </overlay> + <overlay> + <groupId>org.openecomp.ecompsdkos</groupId> + <artifactId>epsdk-app-overlay</artifactId> + </overlay> </overlays> </configuration> </plugin> diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientServiceImpl.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientServiceImpl.java index 4626b17b..f3fda34e 100644 --- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientServiceImpl.java +++ b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientServiceImpl.java @@ -48,6 +48,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.stereotype.Service; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonDeserializationContext; @@ -71,6 +72,8 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient private AppsCacheService appsCacheService; Gson gson = null; + private final ObjectMapper mapper = new ObjectMapper(); + @PostConstruct private void init(){ logger.debug(EELFLoggerDelegate.debugLogger, "initializing"); @@ -185,7 +188,9 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient verifyResponse(response); String str = response.readEntity(String.class); EcompPortalUtils.logAndSerializeObject(restPath, "GET result =", str); - try { t = gson.fromJson(str, clazz); } catch(Exception e) { + try { + t = mapper.readValue(str, clazz); + } catch(Exception e) { logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e)); EPLogUtil.logEcompError(EPAppMessagesEnum.BeInvalidJsonInput); } diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java index 4c97a52d..f953634a 100644 --- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java +++ b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java @@ -26,6 +26,8 @@ public class OnboardingApp { public String name; public String imageUrl; + + public String imageLink; public String description; diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/jsp/login.jsp b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/jsp/login.jsp index c37d6d6f..1b269d80 100644 --- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/jsp/login.jsp @@ -48,6 +48,22 @@ font-family: Verdana,Arial,Helvetica, sans-serif; font-size: 9px; } + .login-tbl { + border: 0px; + } + .login-txt { + font-family: Arial; + font-size: 14px; + text-decoration: none; + } + .login-input-text { + width: 140px; + height:25px; + border-radius:7px; + padding-left:5px; + font-family: Arial; + font-size: 14px; + } .login-btn { cursor: pointer; background: #d97b34; @@ -73,25 +89,34 @@ %> <div ng-controller="externalLoginController"> <div class="centered style="-webkit-transform: translateZ(0);background:white, z-index:0;"> - <div align="center" id="errorInfo" style="display:none;float:left;font-size:12px;margin-left:5px"><span style="color:red">Invaild username or password, Please try again</span></div> + <div align="center" id="errorInfo" style="display:none; float:left; font-family: Arial; font-size:12px; margin-left:5px"> + <span style="color:red">Invalid username or password. Please try again.</span> + </div> <br/> <div align="center" style="margin-left:auto;margin-right:auto;width:40%;padding:6px;background-color:white"> <img src="static/fusion/images/onap-portal-logo.png" height="250"/> <br> <div style="opacity: 0.7;"> - <label> - <label class="form-field__label">Login ID:</label> - </label> - <input type="text" class="fn-ebz-text" ng-model="loginId" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;" - maxlength="30" /> - <br/> - <br/> - <label > Password:</label> - <input type="password" class="span3" ng-model="password" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;" - maxlength="30" onkeydown="if (event.keyCode == 13) document.getElementById('loginBtn').click()"/> - <br /> + <table class="login-tbl"> + <tr> + <td> + <label class="login-txt">Login ID:</label> + </td> + <td> + <input type="text" class="login-input-text" ng-model="loginId" maxlength="30" /> + </td> + </tr> + <tr> + <td> + <label class="login-txt">Password:</label> + </td> + <td> + <input type="password" class="login-input-text" ng-model="password" maxlength="30" + onkeydown="if (event.keyCode == 13) document.getElementById('loginBtn').click()"/> + </td> + </tr> + </table> <br /> - <a class="login-btn" id="loginBtn" ng-click="loginExternal();">LOGIN</a> </div> <br> |