From 53af49f9ae8a3265ecd6a21973298e8c4093fe80 Mon Sep 17 00:00:00 2001
From: Lukasz Lopatowski <llopat@man.poznan.pl>
Date: Fri, 23 Apr 2021 12:11:15 +0200
Subject: [PATCH] Disabled advanced management of terms acceptance field
---
.../app-create-wizard.component.html | 13 +++++++------
.../app-create-wizard.component.ts | 1 +
.../app-version-create-wizard.component.html | 4 +---
.../app-version-create-wizard.component.ts | 1 +
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
index 66ea3130..7a6ad88d 100644
--- a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
+++ b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
@@ -410,7 +410,8 @@
(change)="changeDefaultElementInForms()"
[defaultChecked]="false"
[(ngModel)]="applicationDTO.application.appConfigurationSpec.configFileRepositoryRequired"
- tooltip="{{'APPS_WIZARD.REPOSITORY_REQUIRED_TOOLTIP' | translate}}" [display]="true"
+ tooltip="{{'APPS_WIZARD.REPOSITORY_REQUIRED_TOOLTIP' | translate}}"
+ [display]="true"
[options]="defaultTooltipOptions">
</div>
</div>
@@ -427,8 +428,10 @@
class="col-sm-2 control-label">{{'APPS_WIZARD.BASIC_AUTH_LABEL' | translate}}</label>
<div class="col-sm-10">
<input type="checkbox" id="basicAuth" name="basicAuth" (change)="changeBasicAuthInForms()"
- [defaultChecked]="hasAlreadyBasicAuth()" [(ngModel)]="basicAuth"
- tooltip="{{'APPS_WIZARD.BASIC_AUTH_TOOLTIP' | translate}}" [display]="true"
+ [defaultChecked]="hasAlreadyBasicAuth()"
+ [(ngModel)]="basicAuth"
+ tooltip="{{'APPS_WIZARD.BASIC_AUTH_TOOLTIP' | translate}}"
+ [display]="true"
[options]="defaultTooltipOptions">
</div>
</div>
@@ -437,9 +440,7 @@
class="col-sm-2 control-label">{{'APPS_WIZARD.TERMS_ACCEPTANCE_LABEL' | translate}}</label>
<div class="col-sm-10">
<input type="checkbox" id="termsAcceptance" name="termsAcceptance"
- (change)="changeTermsAcceptanceInForms()"
- [defaultChecked]="hasAlreadyTermsAcceptance()"
- [(ngModel)]="termsAcceptance"
+ [(ngModel)]="applicationDTO.application.appConfigurationSpec.termsAcceptanceRequired"
tooltip="{{'APPS_WIZARD.TERMS_ACCEPTANCE_TOOLTIP' | translate}}"
[display]="true"
[options]="defaultTooltipOptions">
diff --git a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.ts b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.ts
index b7b1517f..8868ff28 100644
--- a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.ts
+++ b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.ts
@@ -472,6 +472,7 @@ export class AppCreateWizardComponent extends BaseComponent implements OnInit {
}, 1);
}
+ // terms acceptance related methods are not used for now
public changeTermsAcceptanceInForms() {
this.formDisplayChange = false;
this.handleTermsAcceptance();
diff --git a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
index 99876c82..4cb4747f 100644
--- a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
+++ b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
@@ -174,9 +174,7 @@
class="col-sm-2 control-label">{{'APPS_WIZARD.TERMS_ACCEPTANCE_LABEL' | translate}}</label>
<div class="col-sm-10">
<input type="checkbox" id="termsAcceptance" name="termsAcceptance"
- (change)="changeTermsAcceptanceInForms()"
- [defaultChecked]="hasAlreadyTermsAcceptance()"
- [(ngModel)]="termsAcceptance"
+ [(ngModel)]="applicationDTO.application.appConfigurationSpec.termsAcceptanceRequired"
tooltip="{{'APPS_WIZARD.TERMS_ACCEPTANCE_TOOLTIP' | translate}}"
[display]="true"
[options]="defaultTooltipOptions">
diff --git a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.ts b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.ts
index 7eec43b1..48c51ba4 100644
--- a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.ts
+++ b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.ts
@@ -332,6 +332,7 @@ export class AppVersionCreateWizardComponent extends BaseComponent implements On
}
}
+ // terms acceptance related methods are not used for now
public changeTermsAcceptanceInForms() {
this.formDisplayChange = false;
this.handleTermsAcceptance();
--
GitLab