Skip to content
Snippets Groups Projects
Commit 221583a9 authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Passing termsAcceptance as part of app configuration

parent 8348bc9e
Branches
Tags
No related merge requests found
...@@ -5,7 +5,7 @@ plugins { ...@@ -5,7 +5,7 @@ plugins {
id "org.sonarqube" version "3.0" id "org.sonarqube" version "3.0"
} }
version = '1.4.1' version = '1.4.2-SNAPSHOT'
task buildGUI(type: Exec) { task buildGUI(type: Exec) {
println 'Building using Angular CLI' println 'Building using Angular CLI'
......
#!/bin/bash #!/bin/bash
TAG=1.4.1 TAG=1.4.2
PACKAGE=nmaas-portal PACKAGE=nmaas-portal
REPOSITORY=artifactory.geant.net/nmaas-docker-local REPOSITORY=artifactory.geant.net/nmaas-docker-local
sudo docker build --rm -t $REPOSITORY/$PACKAGE:$TAG -f ./Dockerfile .. sudo docker build --rm -t $REPOSITORY/$PACKAGE:$TAG -f ./Dockerfile ..
......
...@@ -362,6 +362,12 @@ export class AppInstanceComponent implements OnInit, OnDestroy { ...@@ -362,6 +362,12 @@ export class AppInstanceComponent implements OnInit, OnDestroy {
} }
} }
public changeTermsAcceptance(termsAcceptance: any): void {
if (termsAcceptance != null) {
this.appConfiguration.termsAcceptance = termsAcceptance;
}
}
public changeConfiguration(configuration: any): void { public changeConfiguration(configuration: any): void {
if (configuration != null) { if (configuration != null) {
this.appConfiguration.jsonInput = configuration; this.appConfiguration.jsonInput = configuration;
...@@ -376,6 +382,7 @@ export class AppInstanceComponent implements OnInit, OnDestroy { ...@@ -376,6 +382,7 @@ export class AppInstanceComponent implements OnInit, OnDestroy {
this.changeAdditionalParameters(input['additionalParameters']); this.changeAdditionalParameters(input['additionalParameters']);
this.changeConfiguration(input['configuration']); this.changeConfiguration(input['configuration']);
this.changeAccessCredentials(input['accessCredentials']); this.changeAccessCredentials(input['accessCredentials']);
this.changeTermsAcceptance(input['termsAcceptance']);
if (this.appConfiguration.jsonInput == null) { if (this.appConfiguration.jsonInput == null) {
this.appConfiguration.jsonInput = {}; this.appConfiguration.jsonInput = {};
} }
......
...@@ -3,5 +3,6 @@ export class AppConfiguration { ...@@ -3,5 +3,6 @@ export class AppConfiguration {
public additionalParameters: any; public additionalParameters: any;
public mandatoryParameters: any; public mandatoryParameters: any;
public accessCredentials: any; public accessCredentials: any;
public termsAcceptance: any;
public storageSpace: number; public storageSpace: number;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment