summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deliveries/docker-compose.yml6
-rw-r--r--ecomp-portal-BE-os/README.md2
-rw-r--r--ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js3
-rw-r--r--ecomp-portal-FE-os/client/index.html2
-rw-r--r--pom.xml2
5 files changed, 11 insertions, 4 deletions
diff --git a/deliveries/docker-compose.yml b/deliveries/docker-compose.yml
index 9af92f63..bba42aac 100644
--- a/deliveries/docker-compose.yml
+++ b/deliveries/docker-compose.yml
@@ -45,6 +45,7 @@ services:
environment:
- CASSUSER=root
- CASSPASS=Aa123456
+ - JVM_OPTS=-Xmx2536m -Xms2536m
expose:
- 7000
- 7001
@@ -125,7 +126,8 @@ services:
- $EXTRA_HOST_NAME
logging:
driver: json-file
-
+ environment:
+ - CATALINA_OPTS=-Xmx1536m -Xms1536m
portal-sdk:
image: ${SDK_IMG_NAME}:${PORTAL_TAG}
ports:
@@ -149,3 +151,5 @@ services:
- /start-apache-tomcat.sh
logging:
driver: json-file
+ environment:
+ - CATALINA_OPTS=-Xmx1536m -Xms1536m \ No newline at end of file
diff --git a/ecomp-portal-BE-os/README.md b/ecomp-portal-BE-os/README.md
index d3bd1fd6..8cf6d975 100644
--- a/ecomp-portal-BE-os/README.md
+++ b/ecomp-portal-BE-os/README.md
@@ -15,6 +15,7 @@ https://www.eclipse.org/m2e-wtp/
## Release Notes
Version 2.2
+- [PORTAL-255] Scheduler Popup opens when page loads
- [PORTAL-210] Music jar update
- [PORTAL-179] wrong menu available to App Admin User
- [PORTAL-207] Raise 4 % percentage (from 44 to 48) sonar code coverage for ONAP PORTAL
@@ -42,6 +43,7 @@ Version 2.2
- [Portal-241] To reteieve roles on Users page for sdk(external app)
- [Portal-220] Fix to delete a portal admin
- [Portal-256] Fix to make the userRole dynamic on Users modal popup
+- [Portal-211] High memory Usage by Portal, SDK, Cassandra
Version 1.1.0 (Amsterdam), November 2017
- [Portal-6] Updates to License and Trademark in the PORTAL Source Code
diff --git a/ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js b/ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js
index 2bf812e4..c4b31ef2 100644
--- a/ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js
@@ -266,7 +266,8 @@
},false);
$scope.openModal = function(data){
- schedulerService.showWidget(data.widgetName,data.widgetData,data.widgetParameter).then(isConfirmed => {});
+ if(data!=null && data!='' && data.widgetData!=null)
+ schedulerService.showWidget(data.widgetName,data.widgetData,data.widgetParameter).then(isConfirmed => {});
}
}
}
diff --git a/ecomp-portal-FE-os/client/index.html b/ecomp-portal-FE-os/client/index.html
index 32f3a5c0..a6dbd23c 100644
--- a/ecomp-portal-FE-os/client/index.html
+++ b/ecomp-portal-FE-os/client/index.html
@@ -33,7 +33,7 @@
============LICENSE_END============================================
- ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
-->
<!doctype html>
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
diff --git a/pom.xml b/pom.xml
index 3bb1379f..6978ce8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<encoding>UTF-8</encoding>
<sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
- <enforcer.skip>true</enforcer.skip>
+ <enforcer.skip>false</enforcer.skip>
</properties>
<!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml