Prevent error from locations map in case map provider faulty or missing

mainio · Apr 11, 2024 · c7f744a · c7f744a
1 parent 444652f
commit c7f744a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/...le-accountability_locations/app/views/decidim/accountability/admin/results/_form.html.erb b/...le-accountability_locations/app/views/decidim/accountability/admin/results/_form.html.erb
@@ -12,9 +12,11 @@
       <%= form.translated :editor, :description %>
     </div>
 
-    <div class="row column">
-      <%= cell("decidim/locations/locations", @result, form: form, coords: [current_component.settings.default_latitude, current_component.settings.default_longitude], checkbox: true) %>
-    </div>
+    <% if Decidim::Map.autocomplete(organization: current_organization).present? %>
+      <div class="row column">
+        <%= cell("decidim/locations/locations", @result, form: form, coords: [current_component.settings.default_latitude, current_component.settings.default_longitude], checkbox: true) %>
+      </div>
+    <% end %>
 
     <% if @form.parent_id %>
 

diff --git a/decidim-module-forms_locations/app/views/decidim/forms/admin/questionnaires/_form.html.erb b/decidim-module-forms_locations/app/views/decidim/forms/admin/questionnaires/_form.html.erb
@@ -121,7 +121,15 @@
   <% end %>
 </div>
 
-<% begin %>
+<%= javascript_pack_tag "decidim_forms_admin", defer: false %>
+
+<% if questionnaire.questions_editable? %>
+  <script>
+    window.Decidim.createEditableForm()
+  </script>
+<% end %>
+
+<% if Decidim::Map.autocomplete(organization: current_organization).present? %>
   <div id="answer-option-map-selector" data-reveal class="reveal answer_option_map">
     <%= cell(
       "decidim/locations/locations",
@@ -132,13 +140,4 @@
       select_location: true
     ) %>
   </div>
-<% rescue StandardError => error %>
-<% end %>
-
-<%= javascript_pack_tag "decidim_forms_admin", defer: false %>
-
-<% if questionnaire.questions_editable? %>
-  <script>
-    window.Decidim.createEditableForm()
-  </script>
 <% end %>
diff --git a/decidim-module-meetings_locations/app/views/decidim/meetings/admin/meetings/_form.html.erb b/decidim-module-meetings_locations/app/views/decidim/meetings/admin/meetings/_form.html.erb
@@ -19,7 +19,11 @@
     </div>
 
     <div class="field" data-meeting-type="in_person">
-      <%= cell("decidim/locations/locations", @meeting, form: form, coords: [current_component.settings.default_latitude, current_component.settings.default_longitude], checkbox: false) %>
+      <% if Decidim::Map.autocomplete(organization: current_organization).present? %>
+        <%= cell("decidim/locations/locations", @meeting, form: form, coords: [current_component.settings.default_latitude, current_component.settings.default_longitude], checkbox: false) %>
+      <% else %>
+        <%= form.geocoding_field :address %>
+      <% end %>
       <p class="help-text"><%= t(".address_help") %></p>
     </div>
 

diff --git a/decidim-module-meetings_locations/app/views/decidim/meetings/meetings/_form.html.erb b/decidim-module-meetings_locations/app/views/decidim/meetings/meetings/_form.html.erb
@@ -14,9 +14,9 @@
 </div>
 
 <div class="field" data-meeting-type="in_person">
-  <% begin %>
+  <% if Decidim::Map.autocomplete(organization: current_organization).present? %>
     <%= cell("decidim/locations/locations", meeting, form: form, coords: [current_component.settings.default_latitude, current_component.settings.default_longitude], checkbox: false) %>
-  <% rescue StandardError => error %>
+  <% else %>
     <%= form.geocoding_field :address, input_html: { required: false } %>
   <% end %>
   <p class="help-text"><%= t(".address_help") %></p>