From b0a0268a4ea9459c540219524c30c7d8eb14600f Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 13 Jul 2022 10:49:59 +0300 Subject: [PATCH] Fix uk-close in criteria and subjects. Criteria: Add a criterion should be added at start --- src/app/openaireLibrary | 2 +- .../content-providers/criteria/criteria.component.html | 8 ++++---- .../content-providers/criteria/criteria.component.ts | 2 +- .../subjects-edit-form/subjects-edit-form.component.html | 8 ++++---- src/assets/openaire-theme | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index ea95219..770c3fb 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit ea952197289da5113cfb67c4c911cb5fd1583909 +Subproject commit 770c3fb3eff99ddab059f0de657f576443b01a7d diff --git a/src/app/pages/content-providers/criteria/criteria.component.html b/src/app/pages/content-providers/criteria/criteria.component.html index 6357dd2..34a9222 100644 --- a/src/app/pages/content-providers/criteria/criteria.component.html +++ b/src/app/pages/content-providers/criteria/criteria.component.html @@ -46,10 +46,10 @@ class="uk-margin-bottom uk-hidden@l">
@@ -92,10 +92,10 @@ (change)="caseSensitive($event, constraint)">
diff --git a/src/app/pages/content-providers/criteria/criteria.component.ts b/src/app/pages/content-providers/criteria/criteria.component.ts index 5a3d659..ed03649 100644 --- a/src/app/pages/content-providers/criteria/criteria.component.ts +++ b/src/app/pages/content-providers/criteria/criteria.component.ts @@ -101,7 +101,7 @@ export class CriteriaComponent implements OnInit { verb_suffix: this.fb.control('_caseinsensitive') }) ]); - this.criteria.push(this.fb.group({ + this.criteria.insert(0, this.fb.group({ constraint: constraintArray })); this.page = Math.ceil(this.criteria.length/this.pageSize); diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html index a989628..87d091a 100644 --- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html +++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html @@ -95,8 +95,8 @@
- @@ -106,10 +106,10 @@
- - +
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index c80b737..e4c7254 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit c80b7371801d42611c611707ca933c1c83c3c672 +Subproject commit e4c7254752de49fc801a30bde3cf0120e42cf9da