Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add current site to editors (sites) in create element Factories #824 #827

Merged
merged 1 commit into from
Nov 30, 2023
+27 −13
Merged

feat: add current site to editors (sites) in create element Factories #824 #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion rdmo/management/assets/js/factories/ConditionsFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] : [],
}
}

Expand Down
7 changes: 4 additions & 3 deletions rdmo/management/assets/js/factories/DomainFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class QuestionsFactory {
MyPyDavid marked this conversation as resolved.
Show resolved Hide resolved
class DomainFactory {

static createAttribute(config, parent) {
return {
Expand All @@ -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
6 changes: 4 additions & 2 deletions rdmo/management/assets/js/factories/OptionsFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] : [],
}
}

Expand All @@ -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] : [],
}
}

Expand Down
16 changes: 11 additions & 5 deletions rdmo/management/assets/js/factories/QuestionsFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] : [],
}
}

Expand All @@ -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] : [],
}
}

Expand All @@ -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] : [],
}
}

Expand All @@ -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] : [],
}
}

Expand All @@ -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] : [],
}
}

Expand Down
4 changes: 3 additions & 1 deletion rdmo/management/assets/js/factories/TasksFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] : [],
}
}

Expand Down
4 changes: 3 additions & 1 deletion rdmo/management/assets/js/factories/ViewsFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] : [],
}
}

Expand Down