From 2156fa68f6fd7b30693d954264fa4b221081172f Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 10 Oct 2019 12:01:38 +0200
Subject: [PATCH] Change the name of resource field and repair form fill.
---
.../resources/resource-report-broken-link.pug | 4 ++--
src/scripts/coopstarter.js | 17 +++++++++++------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/includes/mentor/resources/resource-report-broken-link.pug b/src/includes/mentor/resources/resource-report-broken-link.pug
index b7b2be12..568286d9 100644
--- a/src/includes/mentor/resources/resource-report-broken-link.pug
+++ b/src/includes/mentor/resources/resource-report-broken-link.pug
@@ -8,8 +8,8 @@
p The submitter of the resource will be advised that this link is broken.
sib-form#report-broken-link(
data-src=`${endpoints.brokenlinks}`
- fields = "resource_id, submitter"
- widget-resource_id='sib-form-hidden'
+ fields = "resource, submitter"
+ widget-resource='sib-form-hidden'
widget-submitter='sib-form-hidden'
submit-button='ok'
next="mentor-resource-list"
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index ec974a8d..5c051ad1 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -144,15 +144,15 @@ function selectHiddenManagementForType(tab, form) {
}
//Manage the report broken links hidden form
-function fillReportBrokenLinkForm(event) {
+function fillReportBrokenLinkForm(event, userWhoSubmitReport) {
var formBrokenLink = document.getElementById("report-broken-link");
formBrokenLink.querySelector(
- "input[name='resource_id']"
+ "input[name='resource']"
).value = JSON.stringify({ "@id": event.target.dataset.src });
formBrokenLink.querySelector(
"input[name='submitter']"
- ).value = JSON.stringify({ "@id": userAccountDataSrc.dataset.src });
+ ).value = JSON.stringify({ "@id": userWhoSubmitReport });
}
function addProperFilterToSearchComponents(targetId) {
@@ -174,7 +174,9 @@ 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="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(
@@ -388,7 +390,8 @@ jQuery(document).ready(function($) {
//Manage the form to report broken link.
let detailsMentor = document.getElementById("detail-mentor");
detailsMentor.addEventListener("populate", event => {
- fillReportBrokenLinkForm(event);
+ var userWhoSubmitReport = userAccountDataSrc.dataset.src
+ fillReportBrokenLinkForm(event, userWhoSubmitReport);
});
var forms = document.querySelectorAll("sib-form");
@@ -460,7 +463,9 @@ jQuery(document).ready(function($) {
//Manage the form to report broken link.
let detailsEntrepreneur = document.getElementById("detail-entrepreneur");
detailsEntrepreneur.addEventListener("populate", event => {
- fillReportBrokenLinkForm(event);
+ var userWhoSubmitReport = userAccountDataSrc.dataset.src
+
+ fillReportBrokenLinkForm(event, userWhoSubmitReport);
});
//Accordion by step
--
GitLab