From f03552714077df2a3f11fe33a81342558dfe1705 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Fri, 18 Aug 2017 14:37:47 -0400 Subject: Repair centralized-role feature. Also show ONAP logo in EPSDK-app header top left. Issue: PORTAL-21, PORTAL-81 Change-Id: I46953123219d4f7a239ca6c5a05890a3769ed2ea Signed-off-by: Christopher Lott (cl778h) --- ecomp-sdk/epsdk-app-overlay/README.md | 13 +++++++------ .../fusion/scripts/DS2-controllers/admin-controller.js | 3 ++- .../app/fusion/scripts/DS2-view-models/ds2Header.html | 3 +-- .../src/main/webapp/app/fusion/styles/ecomp.css | 4 ++++ .../webapp/app/fusionapp/icons/logo_onap_transbg.png | Bin 0 -> 52523 bytes 5 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusionapp/icons/logo_onap_transbg.png (limited to 'ecomp-sdk/epsdk-app-overlay') diff --git a/ecomp-sdk/epsdk-app-overlay/README.md b/ecomp-sdk/epsdk-app-overlay/README.md index 1a0798f9..5ed68c5e 100644 --- a/ecomp-sdk/epsdk-app-overlay/README.md +++ b/ecomp-sdk/epsdk-app-overlay/README.md @@ -18,14 +18,15 @@ AngularJS version 1.5.0. ### ONAP Distributions Version 1.3.0 -- [Portal-19] Renaming the Group Id in the POM file to org.onap.portal.sdk -- [PORTAL-17] removing eye.js and utils.js - rework -- [PORTAL-21] Increased Role name size in UI +- Portal-17 removing eye.js and utils.js - rework +- Portal-19 Renaming the Group Id in the POM file to org.onap.portal.sdk +- Portal-21 Increased Role name size in UI +- Portal-81 Add ONAP logo to header in app overlay Version 1.1.0 -[Portal-7] Improvements added as part of the rebasing process -[Portal-10] Enhancing Drill Down Capabilities of EcompSDK Analytics -[PORTAL-17] Remove jfree related items +- Portal-7 Improvements added as part of the rebasing process +- Portal-10 Enhancing Drill Down Capabilities of EcompSDK Analytics +- PORTAL-17 Remove jfree related items Version 1.0.0 - Initial release diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js index 109c1c7b..d7adaf36 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js @@ -741,6 +741,7 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.saveRole = function() { var errorMsg; + if($scope.role.id == null || $scope.role.id == undefined ){ $scope.role = { 'id':null, 'created':null, @@ -759,7 +760,7 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal 'toggleActiveImage':" / static fusion images inactive.png ", 'editUrl':" role.htm ? role_id = null", }; - + } // Validate non-empty priority as integer if ($scope.role.priority && $scope.role.priority != '' && isNaN(parseInt($scope.role.priority))) { errorMsg = 'Priority must be an integer.'; diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2Header.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2Header.html index 5c0e2bcc..d0748e1d 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2Header.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2Header.html @@ -2,8 +2,7 @@