From c77a26a3eba426c37f10d62a5ca32425b2acffb6 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Tue, 10 Dec 2019 21:32:40 +0100
Subject: [PATCH 1/3] Switching to partial
---
src/includes/entrepreneur/profile/create.pug | 1 +
src/includes/entrepreneur/profile/edit.pug | 1 +
src/includes/entrepreneur/requests/create.pug | 1 +
src/includes/mentor/profile/create.pug | 5 ++---
src/includes/mentor/resources/create.pug | 1 +
src/includes/mentor/resources/edit.pug | 1 +
src/includes/public/resources/list.pug | 2 +-
7 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/includes/entrepreneur/profile/create.pug b/src/includes/entrepreneur/profile/create.pug
index 4bd26934..37614b5a 100644
--- a/src/includes/entrepreneur/profile/create.pug
+++ b/src/includes/entrepreneur/profile/create.pug
@@ -9,6 +9,7 @@ figure.logo.img_log
h2.title_create=`${data.CompleteEntrepreneurAccount}`
sib-form#entrepreneur_profile_creation.block_log.block_creat_count(
+ partial
bind-user
fields="last_name, first_name, entrepreneurProfile.organisation, account.picture, username"
diff --git a/src/includes/entrepreneur/profile/edit.pug b/src/includes/entrepreneur/profile/edit.pug
index 9a411af8..924a1794 100644
--- a/src/includes/entrepreneur/profile/edit.pug
+++ b/src/includes/entrepreneur/profile/edit.pug
@@ -1,6 +1,7 @@
h2.title_create= data.EditYourAccount
sib-form#entrepreneur_profile_edition.block_log.block_creat_count(
+ partial
bind-user
fields="info(last_name, first_name, username, email, entrepreneurProfile.organisation, account.picture)"
range-entrepreneurProfile.organisation=`${endpoints.organisations}`
diff --git a/src/includes/entrepreneur/requests/create.pug b/src/includes/entrepreneur/requests/create.pug
index 8291703f..27db6d47 100644
--- a/src/includes/entrepreneur/requests/create.pug
+++ b/src/includes/entrepreneur/requests/create.pug
@@ -13,6 +13,7 @@
img(src="../images/asid_entre.png" alt="rechercher de ressources")
sib-form#resource-creation-form(
+ partial
loader-id="resource-creation-form-loader"
data-src=`${endpoints.requests}`
fields="mandatory_information(header_mandatory, name, description, country, language),\
diff --git a/src/includes/mentor/profile/create.pug b/src/includes/mentor/profile/create.pug
index e7bc8388..23aa86ec 100644
--- a/src/includes/mentor/profile/create.pug
+++ b/src/includes/mentor/profile/create.pug
@@ -10,11 +10,12 @@ h2.title_create= data.CompleteMentorAccount
sib-form#mentor_profile_creation.block_log.block_creat_count(
bind-user
+ partial
fields="account_information(last_name, first_name, mentorProfile.organisation,\
mentorProfile.phone, mentorProfile.languages, mentorProfile.fields),\
about_you(header_about_you, account.picture, mentorProfile.headline, mentorProfile.city, mentorProfile.country,\
mentorProfile.biography, mentorProfile.skills),\
- social_media(header_social_media, mentorProfile.linkedin, mentorProfile.twitter), username, account.slug"
+ social_media(header_social_media, mentorProfile.linkedin, mentorProfile.twitter), username"
range-mentorProfile.fields=`${endpoints.fields}`
range-mentorProfile.organisation=`${endpoints.organisations}`
@@ -46,8 +47,6 @@ sib-form#mentor_profile_creation.block_log.block_creat_count(
widget-mentorProfile.skills="sib-form-textarea"
widget-mentorProfile.biography="sib-form-textarea"
widget-username="sib-form-hidden"
- widget-account.slug="sib-form-hidden"
- value-account.slug=""
class-mentorProfile.organisation='form-label is-dark'
widget-mentorProfile.organisation='sib-form-auto-completion'
diff --git a/src/includes/mentor/resources/create.pug b/src/includes/mentor/resources/create.pug
index be06ba6e..2b5bc0f1 100644
--- a/src/includes/mentor/resources/create.pug
+++ b/src/includes/mentor/resources/create.pug
@@ -5,6 +5,7 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
.block_log.block_creat_count
sib-form#resource-creation-form(
data-src=`${endpoints.resources}`
+ partial
fields="mandatory_information(header_mandatory, name, country, language, uri,\
format, fields, author, publication_year, skills),\
complementary_information(header_complementary, description, iframe_link,\
diff --git a/src/includes/mentor/resources/edit.pug b/src/includes/mentor/resources/edit.pug
index 7937469a..6fdc52f5 100644
--- a/src/includes/mentor/resources/edit.pug
+++ b/src/includes/mentor/resources/edit.pug
@@ -5,6 +5,7 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
.block_log.block_creat_count
sib-form(
bind-resources
+ partial
fields="mandatory_information(header_mandatory, name, country, language, uri,\
format, field, author, publication_year, skills),\
complementary_information(header_complementary, description, iframe_link,\
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index f69ae98d..1deed45b 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -105,7 +105,7 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- data-src=`${endpoints.steps}1/resources/validated/`,
+ data-src=`${endpoints.step1}`,
fields='name, author, format.name, publication_year, description, 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}`
--
GitLab
From 90f5b8bcef90f021d396f5b3ca1c0667b751822b Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Tue, 10 Dec 2019 23:18:27 +0100
Subject: [PATCH 2/3] Switch form to partial
---
src/includes/mentor/profile/edit.pug | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug
index 2e8c5786..a67627c8 100644
--- a/src/includes/mentor/profile/edit.pug
+++ b/src/includes/mentor/profile/edit.pug
@@ -2,6 +2,7 @@ h2.title_create= data.EditYourAccount
sib-form#mentor_profile_edition.block_log.block_creat_count(
bind-user
+ partial
fields="account_information(last_name, first_name, mentorProfile.organisation,\
mentorProfile.phone, mentorProfile.languages, mentorProfile.fields),\
about_you(header_about_you, account.picture, mentorProfile.headline, mentorProfile.city, mentorProfile.country,\
--
GitLab
From 9123ac5892aa44530cf91fef104b2102ed275498 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Sun, 12 Jan 2020 19:43:31 +0100
Subject: [PATCH 3/3] Fix previous
---
src/includes/public/resources/list.pug | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index 1deed45b..f69ae98d 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -105,7 +105,7 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- data-src=`${endpoints.step1}`,
+ data-src=`${endpoints.steps}1/resources/validated/`,
fields='name, author, format.name, publication_year, description, 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}`
--
GitLab