From eed570dc8716d2e3b01bf3d6a8e0fc1c0e797e5c Mon Sep 17 00:00:00 2001
From: Jure Ursic <jure@colab.coop>
Date: Thu, 18 Jun 2020 04:58:39 +0200
Subject: [PATCH] fix: Customer additional field
---
src/dependencies.pug | 4 +---
src/page-project.pug | 1 -
src/scripts/reactive-store.js | 12 +++++++++---
src/views/project/page-project-edit.pug | 2 +-
src/views/project/page-project-picture.pug | 1 +
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/dependencies.pug b/src/dependencies.pug
index 7aa93ee1..debdfe58 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -19,9 +19,7 @@ if endpoints.events || (endpoints.get && endpoints.get.events)
if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.3" defer)
- script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3" defer)
- //- script(type="module" src="/lib/sib-job-board/sib-job-board.js" defer)
- //- script(type="module" src="/lib/sib-conversation/sib-conversation.js" defer)
+ //- script(type="module" src="/lib/sib-job-board/dist/index.js" defer)
if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users))
script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.4" defer)
diff --git a/src/page-project.pug b/src/page-project.pug
index ac992606..23fe1c46 100644
--- a/src/page-project.pug
+++ b/src/page-project.pug
@@ -34,5 +34,4 @@ nav.jsRightMenu(role='navigation')
sib-route(name='project-information')
li
a Information
- sib-route(name='project-contributions-help')
sib-route(name='project-picture' use-id)
\ No newline at end of file
diff --git a/src/scripts/reactive-store.js b/src/scripts/reactive-store.js
index a8bd6087..f2b16938 100644
--- a/src/scripts/reactive-store.js
+++ b/src/scripts/reactive-store.js
@@ -27,9 +27,15 @@ async function updateSources(resource) {
async function resToChildrens(resource) {
resource = resource.getResourceData();
- refreshSibDisplays(resource["http://happy-dev.fr/owl/#user"]["@id"]);
- refreshSibDisplays(resource["http://happy-dev.fr/owl/#project"]["@id"] + "members/");
- refreshSibDisplays(resource["http://happy-dev.fr/owl/#circle"]["@id"] + "members/");
+ if (resource["http://happy-dev.fr/owl/#user"]) {
+ refreshSibDisplays(resource["http://happy-dev.fr/owl/#user"]["@id"]);
+ }
+ if (resource["http://happy-dev.fr/owl/#project"]) {
+ refreshSibDisplays(resource["http://happy-dev.fr/owl/#project"]["@id"] + "members/");
+ }
+ if (resource["http://happy-dev.fr/owl/#circle"]) {
+ refreshSibDisplays(resource["http://happy-dev.fr/owl/#circle"]["@id"] + "members/");
+ }
}
//auxiliary function updates displays using a given resource
diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug
index e87de384..83bec422 100644
--- a/src/views/project/page-project-edit.pug
+++ b/src/views/project/page-project-edit.pug
@@ -31,7 +31,7 @@ div.content-box__info
next='project-information'
)
- h2 PPhoto du projet
+ h2 Photo du projet
sib-form.form-picture(
bind-resources
diff --git a/src/views/project/page-project-picture.pug b/src/views/project/page-project-picture.pug
index 7c92cccd..32b56227 100644
--- a/src/views/project/page-project-picture.pug
+++ b/src/views/project/page-project-picture.pug
@@ -11,4 +11,5 @@ div.content-box__info
nested-fields='customer'
fields='logo'
next='project-edit'
+ additional='name'
)
--
GitLab