Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-06-29 00:05:09 +02:00
Code Issues Projects Releases Wiki Activity

Add validator for duration of banner message (#19057)

Browse Source 
1.Fixes #19049

Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
Shijun Sun 2023-08-01 18:31:32 +08:00 committed by GitHub
parent b496edf304
commit 39ec1e4b1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/portal/src/app/base/left-side-nav/config/system/system-settings.component.html
View File

@ -434,10 +434,14 @@
!messageText !messageText
}"> }">
<label>{{ 'BANNER_MESSAGE.FROM' | translate }}</label> <label>{{ 'BANNER_MESSAGE.FROM' | translate }}</label>
<clr-date-container>
<input <input
class="date" class="date"
type="date" type="date"
id="from" id="from"
autocomplete="off"
min="{{ currentDate | date : 'yyyy-MM-dd' }}"
max="{{ messageToDate | date : 'yyyy-MM-dd' }}"
clrDate clrDate
[(ngModel)]="messageFromDate" [(ngModel)]="messageFromDate"
[ngModelOptions]="{ standalone: true }" [ngModelOptions]="{ standalone: true }"
@ -445,6 +449,7 @@
!currentConfig.banner_message.editable || !currentConfig.banner_message.editable ||
!messageText !messageText
" /> " />
</clr-date-container>
</div> </div>
<div <div
class="clr-checkbox-wrapper flex ml-1" class="clr-checkbox-wrapper flex ml-1"
@ -454,17 +459,21 @@
!messageText !messageText
}"> }">
<label>{{ 'BANNER_MESSAGE.TO' | translate }}</label> <label>{{ 'BANNER_MESSAGE.TO' | translate }}</label>
<clr-date-container>
<input <input
class="date" class="date"
clrDate clrDate
type="date" type="date"
id="to" id="to"
min="{{ minDateForEndDay | date : 'yyyy-MM-dd' }}"
autocomplete="off"
[(ngModel)]="messageToDate" [(ngModel)]="messageToDate"
[disabled]=" [disabled]="
!currentConfig.banner_message.editable || !currentConfig.banner_message.editable ||
!messageText !messageText
" "
[ngModelOptions]="{ standalone: true }" /> [ngModelOptions]="{ standalone: true }" />
</clr-date-container>
</div> </div>
</div> </div>
</div> </div>

5
src/portal/src/app/base/left-side-nav/config/system/system-settings.component.ts
View File

@ -50,6 +50,8 @@ export class SystemSettingsComponent implements OnInit, OnDestroy {
messageFromDateCopy: Date; messageFromDateCopy: Date;
messageToDateCopy: Date; messageToDateCopy: Date;
bannerRefreshSub: Subscription; bannerRefreshSub: Subscription;
currentDate: Date = new Date();
minDateForEndDay: Date;
@ViewChild('systemConfigFrom') systemSettingsForm: NgForm; @ViewChild('systemConfigFrom') systemSettingsForm: NgForm;
@ -60,6 +62,9 @@ export class SystemSettingsComponent implements OnInit, OnDestroy {
private event: EventService private event: EventService
) { ) {
this.downloadLink = CURRENT_BASE_HREF + '/systeminfo/getcert'; this.downloadLink = CURRENT_BASE_HREF + '/systeminfo/getcert';
this.minDateForEndDay = this.messageFromDate
? this.messageFromDate
: this.currentDate;
} }
ngOnInit() { ngOnInit() {