upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 16:35:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8864 from AllForNothing/master

Browse Source 
remove whitespaces when add tag-retention rule
This commit is contained in:
Will Sun 2019-08-29 08:56:52 +08:00 committed by GitHub
commit fb66d58334
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/portal/lib/src/create-edit-rule/create-edit-rule.component.ts
View File

@ -138,8 +138,8 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy {
});
}
trimText(event) {
if (event.srcElement.value) {
event.srcElement.value = event.srcElement.value.trim();
if (event.target.value) {
event.target.value = event.target.value.trim();
}
}
equals(c1: any, c2: any): boolean {

3
src/portal/src/app/project/tag-retention/add-rule/add-rule.component.ts
View File

@ -179,6 +179,9 @@ export class AddRuleComponent implements OnInit, OnDestroy {
}
add() {
// remove whitespaces
this.rule.scope_selectors.repository[0].pattern = this.rule.scope_selectors.repository[0].pattern.replace(/\s+/g, "");
this.rule.tag_selectors[0].pattern = this.rule.tag_selectors[0].pattern.replace(/\s+/g, "");
if (this.rule.scope_selectors.repository[0].decoration !== "repoMatches"
&& this.rule.scope_selectors.repository[0].pattern.indexOf("**") !== -1) {
this.inlineAlert.showInlineError(INVALID_RULE);