From a71fc8d7a82516be8f7ba538dcf632b1fb812d1a Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.rihtarsic@ext.ec.europa.eu>
Date: Sat, 5 Oct 2019 19:59:41 +0200
Subject: [PATCH] -UI fix domain warning
---
smp-angular/src/app/domain/domain.component.ts | 2 +-
.../service-group-details-dialog.component.ts | 2 +-
.../app/service-group-edit/service-group-edit.component.html | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/smp-angular/src/app/domain/domain.component.ts b/smp-angular/src/app/domain/domain.component.ts
index 45042d4d6..556bea58a 100644
--- a/smp-angular/src/app/domain/domain.component.ts
+++ b/smp-angular/src/app/domain/domain.component.ts
@@ -151,7 +151,7 @@ export class DomainComponent implements OnInit {
msg = "The domain should have a defined signature CertAlias."
}
if (this.lookups.cachedApplicationInfo.smlIntegrationOn) {
- if( domain.smlSmpId && (domain.smlClientKeyAlias || domain.smlClientCertHeader)){
+ if( !domain.smlSmpId || !domain.smlClientCertHeader){
msg = (!msg?"": msg+" ") + "For SML integration the SMP SMP ID and SML client certificate must be defined!"
}
}
diff --git a/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts b/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts
index a811bfc7c..66165a33b 100644
--- a/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts
+++ b/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts
@@ -160,7 +160,7 @@ export class ServiceGroupDetailsDialogComponent implements OnInit {
msg = "The domain should have a defined signature CertAlias."
}
if (this.lookups.cachedApplicationInfo.smlIntegrationOn) {
- if( domain.smlSmpId && (domain.smlClientKeyAlias || domain.smlClientCertHeader)){
+ if( !domain.smlSmpId || !domain.smlClientCertHeader ){
msg = (!msg?"": msg+" ") + "For SML integration the SMP SMP ID and SML client certificate must be defined!"
}
}
diff --git a/smp-angular/src/app/service-group-edit/service-group-edit.component.html b/smp-angular/src/app/service-group-edit/service-group-edit.component.html
index 6c23e2b13..246e483e5 100644
--- a/smp-angular/src/app/service-group-edit/service-group-edit.component.html
+++ b/smp-angular/src/app/service-group-edit/service-group-edit.component.html
@@ -23,9 +23,8 @@
</ng-template>
<ng-template #rowSMPUrlLinkAction let-row="row" let-value="value" ngx-datatable-cell-template
- matTooltip="Open metadata as XML data"
>
- <a target="_blank"
+ <a target="_blank" matTooltip="Open metadata as XML data"
href="{{contextPath}}{{createServiceGroupURL(row)}}">Open URL</a>
</ng-template>
--
GitLab