From cb11b03bdfb82b027aeef7d921bc74fae43d2996 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 3 Oct 2019 21:04:48 +0200
Subject: [PATCH 1/7] bug : make the file same.
---
src/includes/entrepreneur/resources/list.pug | 5 +++--
src/includes/mentor/browseDatabase.pug | 14 +++++++-------
src/includes/public/resources/list.pug | 4 ++++
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index aaf359db..d48d2f90 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -26,6 +26,8 @@ container.block_list.flex.flex_espace
widget-name_keyword='cs-display-property'
+ widget-name_keyword='cs-display-property'
+
naked
)
@@ -114,9 +116,8 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- loader-id="step1-loader"
data-src=`${endpoints.steps}1/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
diff --git a/src/includes/mentor/browseDatabase.pug b/src/includes/mentor/browseDatabase.pug
index 7da74817..eafd5356 100644
--- a/src/includes/mentor/browseDatabase.pug
+++ b/src/includes/mentor/browseDatabase.pug
@@ -24,17 +24,14 @@ container.block_list.flex.flex_espace
div#resources-mentor-database-loader
hidden
i.fas.fa-spinner.fa-spin
- //TODO: The placeholder doesn't work even it's with the exacty same configuration than entrepreneur list. Need investigation
sib-form.search-by-keyword(
data-src=`${endpoints.resources}`,
loader-id="resources-mentor-database-loader"
- fields='keyword(name_keyword, description, author)'
- label-keyword="Search by name..."
- widget-keyword="sib-form-placeholder-text"
+ fields='keyword(name_keyword)'
+ label-name_keyword="Search by name..."
+ widget-name_keyword="sib-form-placeholder-text"
- widget-description='cs-display-property'
widget-name_keyword='cs-display-property'
- widget-author='cs-display-property'
naked
)
@@ -98,8 +95,11 @@ container.block_list.flex.flex_espace
//Step 1
div.step
+ div#resources-loader-step1-browse-database
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display#circles-list(
- loader-id="resources-loader"
+ loader-id="resources-loader-step1-browse-database"
data-src=`${endpoints.steps}1/`,
fields='name'
class="accordion active"
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index de2dbef4..a9316848 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -84,7 +84,11 @@ container.block_list.flex.flex_espace
//Step 1
div.step
+ div#resources-loader-step1-public
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display#circles-list(
+ loader-id="resources-loader-step1-public"
data-src=`${endpoints.steps}1/`,
fields='name'
class="accordion active"
--
GitLab
From 64e4618b2b5d8ffadaf36f2cbb233f3321832a58 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 3 Oct 2019 21:23:23 +0200
Subject: [PATCH 2/7] bug : make the file same.
---
src/includes/entrepreneur/resources/list.pug | 8 ++------
src/includes/mentor/browseDatabase.pug | 2 --
src/includes/public/resources/list.pug | 6 ++----
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index d48d2f90..8bf3c0e9 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -21,12 +21,8 @@ container.block_list.flex.flex_espace
data-src=`${endpoints.resources}`,
loader-id="resources-loader"
fields='keyword(name_keyword)'
- label-keyword="Search by name..."
- widget-keyword="sib-form-placeholder-text"
-
- widget-name_keyword='cs-display-property'
-
- widget-name_keyword='cs-display-property'
+ label-name_keyword="Search by name..."
+ widget-name_keyword="sib-form-placeholder-text"
naked
)
diff --git a/src/includes/mentor/browseDatabase.pug b/src/includes/mentor/browseDatabase.pug
index eafd5356..55ef5a6d 100644
--- a/src/includes/mentor/browseDatabase.pug
+++ b/src/includes/mentor/browseDatabase.pug
@@ -31,8 +31,6 @@ container.block_list.flex.flex_espace
label-name_keyword="Search by name..."
widget-name_keyword="sib-form-placeholder-text"
- widget-name_keyword='cs-display-property'
-
naked
)
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index a9316848..a9aa1ac3 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -17,10 +17,8 @@ container.block_list.flex.flex_espace
data-src=`${endpoints.resources}`,
loader-id="public-resources-loader"
fields='keyword(name_keyword)'
- label-keyword="Search by name..."
- widget-keyword="sib-form-placeholder-text"
-
- widget-name_keyword='cs-display-property'
+ label-name_keyword="Search by name..."
+ widget-name_keyword="sib-form-placeholder-text"
naked
)
--
GitLab
From c64e6f104ff551b96eed68857c3906252c477490 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Thu, 3 Oct 2019 23:05:44 +0200
Subject: [PATCH 3/7] Quick fix on filter by name
---
src/scripts/coopstarter.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 0e35778d..a6a5e8c9 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -157,6 +157,8 @@ function addProperFilterToSearchComponents(targetId) {
keyword_submit.addEventListener("click", function() {
keyword_hidden_fields.forEach(hidden_field => {
hidden_field.setAttribute("value", keyword_field.value);
+ hidden_field.value = keyword_field.value;
+
let parent_form = hidden_field.closest("sib-form");
parent_form.component.inputChange();
refreshPagination();
@@ -282,7 +284,7 @@ function addProperFilterToSearchComponents(targetId) {
'hidden-widget[name="more_criterias_hidden"] input[name="country"]'
);
- if (year_field_search) {
+ if (country_field_search) {
country_field_search.addEventListener("input", function() {
country_hidden_fields.forEach(field => {
inputHiddenManagement(field, country_field_search, form);
--
GitLab
From 64eebb61a07bfb2b6d5c2017d8dd2372ec3fab56 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 3 Oct 2019 23:07:09 +0200
Subject: [PATCH 4/7] WIP : search by name not working.
---
src/includes/entrepreneur/resources/list.pug | 42 +++++++++-----------
src/includes/mentor/browseDatabase.pug | 42 +++++++++-----------
src/includes/public/resources/list.pug | 20 +++++-----
src/scripts/coopstarter.js | 8 ++--
4 files changed, 51 insertions(+), 61 deletions(-)
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 8bf3c0e9..03810d91 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -113,16 +113,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}1/resources/validated/`,
- fields='name, author, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -170,16 +169,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}2/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -227,16 +225,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}3/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -283,16 +280,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}4/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -339,16 +335,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}5/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -395,16 +390,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}6/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
diff --git a/src/includes/mentor/browseDatabase.pug b/src/includes/mentor/browseDatabase.pug
index 55ef5a6d..a928c174 100644
--- a/src/includes/mentor/browseDatabase.pug
+++ b/src/includes/mentor/browseDatabase.pug
@@ -110,16 +110,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}1/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -165,16 +164,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}2/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -221,16 +219,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}3/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -277,16 +274,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}4/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -332,16 +328,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}5/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -387,16 +382,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}6/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index a9aa1ac3..c6f73aa0 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -99,7 +99,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}1/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -155,7 +155,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}2/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -212,7 +212,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}3/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -268,7 +268,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}4/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -324,7 +324,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}5/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -379,16 +379,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}6/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -415,7 +414,8 @@ container.block_list.flex.flex_espace
label-fields=''
multiple-fields
class="panel"
- next='entrepreneur-resource-detail'
+
+ next='public-resource-detail'
paginate-by="5"
)
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 0e35778d..ee596942 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -102,7 +102,7 @@ function selectHiddenManagementForType(tab, form) {
let type_hidden_field = form.querySelectorAll(
'hidden-widget[name="more_criterias_hidden"] select[name="type"]'
);
-
+
if (tab.classList.contains("active")) {
//Fullfill hidden field
let type_field_search = tab
@@ -146,8 +146,10 @@ function addProperFilterToSearchComponents(targetId) {
//To retrieve keyword
//https://git.happy-dev.fr/startinblox/framework/sib-core/issues/379
//TODO: Wait for a solution to filter with multiple value with "OR" instead of "AND".
- let keyword_form = baseElement.querySelectorAll(".search-by-keyword")[0];
- let keyword_field = keyword_form.querySelector(`input[name="keyword"]`);
+ let keyword_form = document.querySelectorAll(".search-by-keyword")[0];
+ let keyword_field = keyword_form.querySelector(
+ `input[name="name_keyword"]`
+ );
let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
let keyword_hidden_fields = baseElement.querySelectorAll(
--
GitLab
From f0452e9e842d83cfae9e2097bbe0b0bbded7a696 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Thu, 3 Oct 2019 23:15:39 +0200
Subject: [PATCH 5/7] Quickfix
---
src/scripts/coopstarter.js | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index a6a5e8c9..a912abb8 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -147,23 +147,25 @@ function addProperFilterToSearchComponents(targetId) {
//https://git.happy-dev.fr/startinblox/framework/sib-core/issues/379
//TODO: Wait for a solution to filter with multiple value with "OR" instead of "AND".
let keyword_form = baseElement.querySelectorAll(".search-by-keyword")[0];
- let keyword_field = keyword_form.querySelector(`input[name="keyword"]`);
+ let keyword_field = keyword_form.querySelector(`input[name="name_keyword"]`);
- let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
- let keyword_hidden_fields = baseElement.querySelectorAll(
- 'hidden-widget[name="search_for_a_resource"] input'
- );
+ if (keyword_field) {
+ let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
+ let keyword_hidden_fields = baseElement.querySelectorAll(
+ 'hidden-widget[name="search_for_a_resource"] input'
+ );
- keyword_submit.addEventListener("click", function() {
- keyword_hidden_fields.forEach(hidden_field => {
- hidden_field.setAttribute("value", keyword_field.value);
- hidden_field.value = keyword_field.value;
+ keyword_submit.addEventListener("click", function() {
+ keyword_hidden_fields.forEach(hidden_field => {
+ hidden_field.setAttribute("value", keyword_field.value);
+ hidden_field.value = keyword_field.value;
- let parent_form = hidden_field.closest("sib-form");
- parent_form.component.inputChange();
- refreshPagination();
+ let parent_form = hidden_field.closest("sib-form");
+ parent_form.component.inputChange();
+ refreshPagination();
+ });
});
- });
+ }
//SEARCH IN DATABASE INSTANCE ONLY
let instance_only = baseElement.querySelectorAll(
--
GitLab
From 1db3708c8e7eede6cc36fa124580626386f1cdd7 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Thu, 10 Oct 2019 10:40:15 +0200
Subject: [PATCH 6/7] Switch back to 0.8
---
src/includes/head.pug | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/includes/head.pug b/src/includes/head.pug
index 3f431dc8..907cc5fc 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -2,7 +2,7 @@ head
title CoopStarter
meta(charset="utf-8")
script(src="https://unpkg.com/@webcomponents/webcomponentsjs@1.2.7/webcomponents-loader.js")
- script(type="module" src="https://unpkg.com/@startinblox/core")
+ script(type="module" src="https://unpkg.com/@startinblox/core@0.8")
script(type="module" src="https://unpkg.com/@startinblox/router")
script(type="module" src="https://unpkg.com/@startinblox/oidc")
script(type="module" src="https://unpkg.com/@startinblox/component-conversation")
--
GitLab
From 0ebf09b9787373b3de4099bcf11c09b6c13540e2 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Fri, 11 Oct 2019 11:14:05 +0200
Subject: [PATCH 7/7] Hiding useless country field
---
src/includes/entrepreneur/resources/list.pug | 12 ++++++------
src/includes/mentor/browseDatabase.pug | 12 ++++++------
src/includes/public/resources/list.pug | 12 ++++++------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 8650cdef..cdc10ab3 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -137,7 +137,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -193,7 +193,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -248,7 +248,7 @@ container.block_list.flex.flex_espace
search-widget-fields='sib-form-auto-completion'
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -304,7 +304,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -359,7 +359,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -414,7 +414,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
diff --git a/src/includes/mentor/browseDatabase.pug b/src/includes/mentor/browseDatabase.pug
index 4cc1aa4a..e2f32bf9 100644
--- a/src/includes/mentor/browseDatabase.pug
+++ b/src/includes/mentor/browseDatabase.pug
@@ -135,7 +135,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -189,7 +189,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -244,7 +244,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -299,7 +299,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -353,7 +353,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -407,7 +407,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index 0934d7bc..92ffcd16 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -122,7 +122,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -178,7 +178,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -235,7 +235,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -291,7 +291,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -347,7 +347,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -402,7 +402,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
--
GitLab