Remove / from uri_path in factories

rdmorganiser · Jul 2, 2024 · cb79c37 · cb79c37
1 parent 171ffab
commit cb79c37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/rdmo/management/assets/js/factories/OptionsFactory.js b/rdmo/management/assets/js/factories/OptionsFactory.js
@@ -13,7 +13,7 @@ class OptionsFactory {
     return {
       model: 'options.option',
       uri_prefix: config.settings.default_uri_prefix,
-      uri_path: parent.optionset ? `${parent.optionset.uri_path}/`: '',
+      uri_path: parent.optionset ? parent.optionset.uri_path : '',
       optionsets: parent.optionset ? [parent.optionset.id] : [],
       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
@@ -15,7 +15,7 @@ class QuestionsFactory {
     return {
       model: 'questions.section',
       uri_prefix: config.settings.default_uri_prefix,
-      uri_path: parent.catalog ? `${parent.catalog.uri_path}/`: '',
+      uri_path: parent.catalog ? parent.catalog.uri_path : '',
       catalogs: parent.catalog ? [parent.catalog.id] : [],
       pages: [],
       editors: config.settings.multisite ? [config.currentSite.id] : [],
@@ -26,7 +26,7 @@ class QuestionsFactory {
     return {
       model: 'questions.page',
       uri_prefix: config.settings.default_uri_prefix,
-      uri_path: parent.section ? `${parent.section.uri_path}/`: '',
+      uri_path: parent.section ? parent.section.uri_path : '',
       sections: parent.section ? [parent.section.id] : [],
       questionsets: [],
       questions: [],
@@ -38,8 +38,8 @@ class QuestionsFactory {
     return {
       model: 'questions.questionset',
       uri_prefix: config.settings.default_uri_prefix,
-      uri_path: parent.page ? `${parent.page.uri_path}/`: (
-        parent.questionset ? `${parent.questionset.uri_path}/`: ''
+      uri_path: parent.page ? parent.page.uri_path : (
+        parent.questionset ? parent.questionset.uri_path : ''
       ),
       pages: parent.page ? [parent.page.id] : [],
       parents: parent.questionset ? [parent.questionset.id] : [],
@@ -53,8 +53,8 @@ class QuestionsFactory {
     return {
       model: 'questions.question',
       uri_prefix: config.settings.default_uri_prefix,
-      uri_path: parent.page ? `${parent.page.uri_path}/`: (
-        parent.questionset ? `${parent.questionset.uri_path}/`: ''
+      uri_path: parent.page ? parent.page.uri_path : (
+        parent.questionset ? parent.questionset.uri_path : ''
       ),
       widget_type: 'text',
       value_type: 'text',