From ffcbf5be4e6bc6fbd53c712618c37160a894dffa Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Wed, 8 Apr 2020 12:00:49 +0200
Subject: [PATCH] Fixing multiple links and the edit form of a resource
---
cypress/integration/public-access.spec.js | 2 +-
src/includes/entrepreneur/resources/detail.pug | 1 -
src/includes/mentor/components/header.pug | 2 +-
src/includes/mentor/profile/confirmation.pug | 2 +-
src/includes/mentor/profile/edit.pug | 2 +-
src/includes/mentor/resources/create.pug | 3 +--
src/includes/mentor/resources/edit.pug | 14 ++++++++------
src/includes/mentor/resources/validate.pug | 2 +-
src/includes/splash.pug | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/cypress/integration/public-access.spec.js b/cypress/integration/public-access.spec.js
index c4711c53..096ae0cb 100644
--- a/cypress/integration/public-access.spec.js
+++ b/cypress/integration/public-access.spec.js
@@ -3,7 +3,7 @@
context('Window', () => {
before(() => {
cy.visit('/en/');
- cy.get('#public-acces').click();
+ cy.get('#public-access').click();
});
it('check heading', () => {
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index 909cb8f8..3ea3fbcb 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -45,7 +45,6 @@
widget-header_specifications='cs-section_header'
widget-iframe_link='iframe-video-resource'
-
label-broken=`${data.ReportBrokenLink}`
label-sharing=`${data.Access}`
label-language.name=`${data.Language}`
diff --git a/src/includes/mentor/components/header.pug b/src/includes/mentor/components/header.pug
index 5781831d..ac47ea5f 100644
--- a/src/includes/mentor/components/header.pug
+++ b/src/includes/mentor/components/header.pug
@@ -1,6 +1,6 @@
.container
.flex.flex_espace.flex_item_center
- sib-link(next='mentor-resource-list')
+ sib-link(next='mentor-dashboard')
figure.logo_head.margin_bord_ecran
img(src=`${client_domain}/images/logo_head.png` alt="Coopstarter")
diff --git a/src/includes/mentor/profile/confirmation.pug b/src/includes/mentor/profile/confirmation.pug
index 7e318508..92b0b82f 100644
--- a/src/includes/mentor/profile/confirmation.pug
+++ b/src/includes/mentor/profile/confirmation.pug
@@ -6,4 +6,4 @@ p.p_entete= data.ModificationsProperlySaved
div
div.flex
h3.button_base
- sib-link(next='mentor-resource-list')= data.BackToDashboard
\ No newline at end of file
+ sib-link(next='mentor-dashboard')= data.BackToDashboard
\ No newline at end of file
diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug
index f0c7efba..08c42597 100644
--- a/src/includes/mentor/profile/edit.pug
+++ b/src/includes/mentor/profile/edit.pug
@@ -64,4 +64,4 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
)
sib-link(class="backlink", next="mentor-account")= data.BackToMyAccount
-sib-link(class="backlink", next="mentor-resource-list")= data.BackToDashboard
+sib-link(class="backlink", next="mentor-dashboard")= data.BackToDashboard
diff --git a/src/includes/mentor/resources/create.pug b/src/includes/mentor/resources/create.pug
index 17b77607..799cb9f3 100644
--- a/src/includes/mentor/resources/create.pug
+++ b/src/includes/mentor/resources/create.pug
@@ -35,7 +35,7 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
label-name=`${data.TitleRequired}`
label-country=`${data.Country}`
- label-language=`${data.Language}`
+ label-language=`${data.Language}*`
label-uri=`${data.LocationWeblinkReq}`
label-format=`${data.FormatReq}`
label-fields=`${data.FieldRequired}`
@@ -67,7 +67,6 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
multiple-steps='sib-multiple-select'
widget-steps='sib-form-auto-completion'
- multiple-language='sib-multiple-select'
widget-language='sib-form-auto-completion'
multiple-related='sib-multiple-select'
diff --git a/src/includes/mentor/resources/edit.pug b/src/includes/mentor/resources/edit.pug
index 092f08a5..f4c59203 100644
--- a/src/includes/mentor/resources/edit.pug
+++ b/src/includes/mentor/resources/edit.pug
@@ -7,7 +7,7 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
bind-resources
partial
fields="mandatory_information(header_mandatory, name, country, language, uri,\
- format, field, author, publication_year, skills),\
+ format, fields, author, publication_year, skills),\
complementary_information(header_complementary, description, iframe_link,\
preview_image),classification(header_classification, target, type, steps),\
access(header_access, sharing),related_section(header_related, related)"
@@ -23,9 +23,11 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
range-format=`${endpoints.formats}`
range-steps=`${endpoints.steps}`
range-language=`${endpoints.languages}`
- range-field=`${endpoints.fields}`
+ range-fields=`${endpoints.fields}`
range-related=`${endpoints.resources}`
range-country=`${endpoints.countries}`
+ range-sharing=`${endpoints.criterias}`
+ range-target=`${endpoints.targets}`
label-header_mandatory=`${data.MandatoryInformation}`
label-header_complementary=`${data.ComplementaryInformation}`
@@ -49,15 +51,16 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
label-target=`${data.ResourceTargetReq}`
label-type=`${data.TypeContentReq}`
label-steps=`${data.CategorisationReq}`
-
label-sharing=`${data.ShareWithReq}`
label-related=`${data.AddResource}`
widget-country='sib-form-auto-completion'
+ widget-sharing='sib-form-auto-completion'
+ widget-target='sib-form-auto-completion'
- multiple-field='sib-multiple-select'
- widget-field='sib-form-auto-completion'
+ multiple-fields='sib-multiple-select'
+ widget-fields='sib-form-auto-completion'
multiple-type='sib-multiple-select'
widget-type='sib-form-auto-completion'
@@ -67,7 +70,6 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
multiple-steps='sib-multiple-select'
widget-steps='sib-form-auto-completion'
- multiple-language='sib-multiple-select'
widget-language='sib-form-auto-completion'
multiple-related='sib-multiple-select'
diff --git a/src/includes/mentor/resources/validate.pug b/src/includes/mentor/resources/validate.pug
index 148933c8..3cf09015 100644
--- a/src/includes/mentor/resources/validate.pug
+++ b/src/includes/mentor/resources/validate.pug
@@ -144,4 +144,4 @@ sib-router
p.flex=`${data.SubmitterWillReceiveReview}`
p.flex=`${data.HeWillPatch}`
p.flex
- sib-link(next='mentor-resource-list', class='button_base')=`${data.BackToDashboard}`
\ No newline at end of file
+ sib-link(next='mentor-dashboard', class='button_base')=`${data.BackToDashboard}`
\ No newline at end of file
diff --git a/src/includes/splash.pug b/src/includes/splash.pug
index 1f97a1fb..3f87edfb 100644
--- a/src/includes/splash.pug
+++ b/src/includes/splash.pug
@@ -15,6 +15,6 @@ h2.title_lead=`${data.welcome}`
button#mentor_login.button_base=`${data.ConnectKnowledgeBase}`
sib-link(next='public-dashboard')
- button#public-acces.button_base=`${data.AccessWithoutRegistration}`
+ button#public-access.button_base=`${data.AccessWithoutRegistration}`
\ No newline at end of file
--
GitLab