Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.frontend into DEVELOP
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
index a5d266c..5d03b03 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
@@ -35,7 +35,7 @@
</button>
<ng-container *ngIf="!formState.value.failureInformationCondensedId && gridFailureDetailsSandbox.showDeleteButton && formState.isEnabled">
<button
- *visibleByRight="RolesEnum.CREATOR"
+ *visibleByRight="[RolesEnum.CREATOR]"
type="button"
class="btn btn-outline-danger delete"
(click)="gridFailureDetailsSandbox.deleteGridFailure()"
@@ -45,7 +45,7 @@
</ng-container>
<ng-container *ngIf="gridFailureDetailsSandbox.showStornoButton && formState.isEnabled">
<button
- *visibleByRight="RolesEnum.QUALIFIER"
+ *visibleByRight="[RolesEnum.QUALIFIER]"
type="button"
class="btn btn-primary right-button"
(click)="gridFailureDetailsSandbox.setState(StateEnum.CANCELED)"
@@ -55,7 +55,7 @@
</ng-container>
<ng-container *ngIf="gridFailureDetailsSandbox.showCompleteButton && formState.isEnabled">
<button
- *visibleByRight="RolesEnum.QUALIFIER"
+ *visibleByRight="[RolesEnum.QUALIFIER]"
type="button"
class="btn btn-primary right-button"
(click)="gridFailureDetailsSandbox.setState(StateEnum.COMPLETED)"
@@ -67,7 +67,7 @@
<div class="subcontainer2" *ngIf="formState.isEnabled || gridFailureDetailsSandbox.showPublishButton">
<ng-container *ngIf="gridFailureDetailsSandbox.showPublishButton && !gridFailureDetailsSandbox.oldVersion">
<button
- *visibleByRight="RolesEnum.PUBLISHER"
+ *visibleByRight="[RolesEnum.PUBLISHER]"
[disabled]="gridFailureDetailsSandbox.disablePublishButton"
[ngClass]="{ disabledButton: gridFailureDetailsSandbox.disablePublishButton }"
type="button"
@@ -79,7 +79,7 @@
</ng-container>
<ng-container *ngIf="gridFailureDetailsSandbox.showQualifyButton">
<button
- *visibleByRight="RolesEnum.QUALIFIER"
+ *visibleByRight="[RolesEnum.QUALIFIER]"
type="button"
class="btn btn-primary button"
(click)="gridFailureDetailsSandbox.setState(StateEnum.QUALIFIED)"
@@ -90,7 +90,7 @@
<ng-container *ngIf="gridFailureDetailsSandbox.showCreatedButton">
<button
type="button"
- *visibleByRight="RolesEnum.CREATOR"
+ *visibleByRight="[RolesEnum.CREATOR]"
class="btn btn-primary right-button"
(click)="gridFailureDetailsSandbox.setState(StateEnum.CREATED)"
>
diff --git a/projects/grid-failure-information-app/src/app/shared/directives/forms/form-disable.directive.ts b/projects/grid-failure-information-app/src/app/shared/directives/forms/form-disable.directive.ts
index 410e112..14159f1 100644
--- a/projects/grid-failure-information-app/src/app/shared/directives/forms/form-disable.directive.ts
+++ b/projects/grid-failure-information-app/src/app/shared/directives/forms/form-disable.directive.ts
@@ -41,7 +41,7 @@
this._permissions$.pipe(take(1), takeUntil(this._endSubscriptions$)).subscribe(permissions => {
if (
!!permissions.reader ||
- (!!permissions.publisher && formState.value.statusIntern === StateEnum.QUALIFIED) ||
+ (!permissions.qualifier && !permissions.creator && formState.value.statusIntern === StateEnum.QUALIFIED) ||
formState.value.statusIntern === StateEnum.COMPLETED ||
formState.value.statusIntern === StateEnum.CANCELED
) {
