Added fallback when choosing static form with dynamic fields

openstad · Mar 8, 2023 · f707f3e · f707f3e · github-actions · Mar 8, 2023
1 parent 3303476
commit f707f3e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/packages/cms/lib/modules/resource-form-widgets/index.js b/packages/cms/lib/modules/resource-form-widgets/index.js
@@ -187,6 +187,7 @@ module.exports = {
 
 
         widget.isTagSelected = function(tagId) {
+          if(!activeResource || !Array.isArray(activeResource.tags)) return false;
           return activeResource.tags.findIndex(t => t.id === tagId) !== -1;
         }
 

diff --git a/packages/cms/lib/modules/resource-form-widgets/public/js/main.js b/packages/cms/lib/modules/resource-form-widgets/public/js/main.js
@@ -188,7 +188,6 @@ $(document).ready(function () {
 
         $(form).find('input[type="submit"]').each(function(index, button) {
           oldButtonValues.push($(this).val());
-
           if(button.id === "btnSaveAsConcept" && publishField.val()) {
             $(this).val('Verzenden...');
           } else if(!publishField.val()) {
@@ -206,6 +205,12 @@ $(document).ready(function () {
           success:function(response) {
               formHasChanged = false;
               var redirect = $(form).find('.form-redirect-uri').val();
+
+              // for some reason when you select the dynamic form then the input field with class .form-redirect-uri is not within the form
+              if(!redirect) {
+                redirect = document.querySelector('.form-redirect-uri').value;
+              }
+
               redirect = redirect.replace(':id', response.id);
               redirect = window.siteUrl + redirect;