From 6441d6cf185d51a9a7287440b7622698a0f25ffd Mon Sep 17 00:00:00 2001 From: David Wallace Date: Thu, 16 Nov 2023 10:58:40 +0100 Subject: [PATCH] feat: #824 add editors, sites to create Factories (when multisite) --- .../assets/js/factories/ConditionsFactory.js | 3 ++- .../assets/js/factories/DomainFactory.js | 7 ++++--- .../assets/js/factories/OptionsFactory.js | 6 ++++-- .../assets/js/factories/QuestionsFactory.js | 16 +++++++++++----- .../assets/js/factories/TasksFactory.js | 4 +++- .../assets/js/factories/ViewsFactory.js | 4 +++- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/rdmo/management/assets/js/factories/ConditionsFactory.js b/rdmo/management/assets/js/factories/ConditionsFactory.js index 28c8cbab48..5f9fa8f15b 100644 --- a/rdmo/management/assets/js/factories/ConditionsFactory.js +++ b/rdmo/management/assets/js/factories/ConditionsFactory.js @@ -9,7 +9,8 @@ class ConditionsFactory { pages: parent.page ? [parent.page.id] : [], questionsets: parent.questionset ? [parent.questionset.id] : [], questions: parent.question ? [parent.question.id] : [], - tasks: parent.task ? [parent.task.id] : [] + tasks: parent.task ? [parent.task.id] : [], + editors: config.settings.multisite ? [config.currentSite.id] : [], } } diff --git a/rdmo/management/assets/js/factories/DomainFactory.js b/rdmo/management/assets/js/factories/DomainFactory.js index 914decb807..3fbc469226 100644 --- a/rdmo/management/assets/js/factories/DomainFactory.js +++ b/rdmo/management/assets/js/factories/DomainFactory.js @@ -1,4 +1,4 @@ -class QuestionsFactory { +class DomainFactory { static createAttribute(config, parent) { return { @@ -8,10 +8,11 @@ class QuestionsFactory { conditions: parent.condition ? [parent.condition.id] : [], pages: parent.page ? [parent.page.id] : [], questionsets: parent.questionset ? [parent.questionset.id] : [], - questions: parent.question ? [parent.question.id] : [] + questions: parent.question ? [parent.question.id] : [], + editors: config.settings.multisite ? [config.currentSite.id] : [], } } } -export default QuestionsFactory +export default DomainFactory diff --git a/rdmo/management/assets/js/factories/OptionsFactory.js b/rdmo/management/assets/js/factories/OptionsFactory.js index 4cb4076017..a0b6436193 100644 --- a/rdmo/management/assets/js/factories/OptionsFactory.js +++ b/rdmo/management/assets/js/factories/OptionsFactory.js @@ -4,7 +4,8 @@ class OptionsFactory { return { model: 'options.optionset', uri_prefix: config.settings.default_uri_prefix, - questions: parent.question ? [parent.question.id] : [] + questions: parent.question ? [parent.question.id] : [], + editors: config.settings.multisite ? [config.currentSite.id] : [], } } @@ -13,7 +14,8 @@ class OptionsFactory { model: 'options.option', uri_prefix: config.settings.default_uri_prefix, optionsets: parent.optionset ? [parent.optionset.id] : [], - conditions: [] + conditions: [], + editors: config.settings.multisite ? [config.currentSite.id] : [], } } diff --git a/rdmo/management/assets/js/factories/QuestionsFactory.js b/rdmo/management/assets/js/factories/QuestionsFactory.js index a9fe2dcd39..bb8d6a47f6 100644 --- a/rdmo/management/assets/js/factories/QuestionsFactory.js +++ b/rdmo/management/assets/js/factories/QuestionsFactory.js @@ -5,7 +5,9 @@ class QuestionsFactory { model: 'questions.catalog', uri_prefix: config.settings.default_uri_prefix, available: true, - sections: [] + sections: [], + sites: config.settings.multisite ? [config.currentSite.id] : [], + editors: config.settings.multisite ? [config.currentSite.id] : [], } } @@ -14,7 +16,8 @@ class QuestionsFactory { model: 'questions.section', uri_prefix: config.settings.default_uri_prefix, catalogs: parent.catalog ? [parent.catalog.id] : [], - pages: [] + pages: [], + editors: config.settings.multisite ? [config.currentSite.id] : [], } } @@ -24,7 +27,8 @@ class QuestionsFactory { uri_prefix: config.settings.default_uri_prefix, sections: parent.section ? [parent.section.id] : [], questionsets: [], - questions: [] + questions: [], + editors: config.settings.multisite ? [config.currentSite.id] : [], } } @@ -35,7 +39,8 @@ class QuestionsFactory { pages: parent.page ? [parent.page.id] : [], parents: parent.questionset ? [parent.questionset.id] : [], questionsets: [], - questions: [] + questions: [], + editors: config.settings.multisite ? [config.currentSite.id] : [], } } @@ -46,7 +51,8 @@ class QuestionsFactory { widget_type: 'text', value_type: 'text', pages: parent.page ? [parent.page.id] : [], - questionsets: parent.questionset ? [parent.questionset.id] : [] + questionsets: parent.questionset ? [parent.questionset.id] : [], + editors: config.settings.multisite ? [config.currentSite.id] : [], } } diff --git a/rdmo/management/assets/js/factories/TasksFactory.js b/rdmo/management/assets/js/factories/TasksFactory.js index b2496654cc..10c2697729 100644 --- a/rdmo/management/assets/js/factories/TasksFactory.js +++ b/rdmo/management/assets/js/factories/TasksFactory.js @@ -3,7 +3,9 @@ class TasksFactory { static createTask(config) { return { model: 'tasks.task', - uri_prefix: config.settings.default_uri_prefix + uri_prefix: config.settings.default_uri_prefix, + sites: config.settings.multisite ? [config.currentSite.id] : [], + editors: config.settings.multisite ? [config.currentSite.id] : [], } } diff --git a/rdmo/management/assets/js/factories/ViewsFactory.js b/rdmo/management/assets/js/factories/ViewsFactory.js index cf91d27a6f..442e612b80 100644 --- a/rdmo/management/assets/js/factories/ViewsFactory.js +++ b/rdmo/management/assets/js/factories/ViewsFactory.js @@ -4,7 +4,9 @@ class ViewsFactory { return { model: 'views.view', uri_prefix: config.settings.default_uri_prefix, - template: '{% load view_tags %}\n' + template: '{% load view_tags %}\n', + sites: config.settings.multisite ? [config.currentSite.id] : [], + editors: config.settings.multisite ? [config.currentSite.id] : [], } }