Merge pull request #2175 from MushroomObserver/nimmo-fix-project-mess…

…ages
MushroomObserver · Jun 11, 2024 · 310c503 · 310c503
2 parents 38b163f + b50cdad
commit 310c503
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 32 deletions.
diff --git a/app/controllers/observations_controller/validators.rb b/app/controllers/observations_controller/validators.rb
@@ -65,6 +65,9 @@ def validate_projects(params)
 
     @suspect_checked_projects = checked_project_conflicts -
                                 @observation.projects
+    if @suspect_checked_projects.any?
+      flash_warning(:form_observations_there_is_a_problem_with_projects.t)
+    end
     @suspect_checked_projects.empty?
   end
 

diff --git a/app/views/controllers/observations/form/_projects.html.erb b/app/views/controllers/observations/form/_projects.html.erb
@@ -1,39 +1,33 @@
 <%# Projects section of create_observation form %>
-<% if @suspect_checked_projects.any? %>
-  <% flash_warning(:form_observations_there_is_a_problem_with_projects.t) %>
-
-  <div class="alert alert-warning"
-       id="project_messages">
-    <%= tag.p(
-      "#{:form_observations_projects_out_of_range.t(
-         date: @observation.when,
-         place_name: @observation.place_name
-      )}:"
-    ) %>
-    <ul>
-      <% @suspect_checked_projects.each do |proj| %>
-        <%= tag.li("#{proj.title} (#{proj.constraints})") %>
-      <% end %>
-    </ul>
-    <%= tag.p(
-      :form_observations_projects_out_of_range_help.
-        t(button_name: button_name)
-    )%>
-  </div>
-<% end %>
 
 <%= fields_for(:project) do |f_p| %>
-  <% if @suspect_checked_projects.any? %>
-    <div class="mt-3 row" id="observation_projects">
-      <%= check_box_with_label(
-        form: f_p, field: :ignore_proj_conflicts,
-        label: :form_observations_projects_ignore_project_constraints.t,
-        class: "alert alert-warning"
-      ) %>
-    </div>
-  <% end %>
-
   <div class="mt-3 row" id="observation_projects">
+    <% if @suspect_checked_projects.any? %>
+      <div class="col-xs-12">
+        <div class="alert alert-warning"
+             id="project_messages">
+          <%= tag.p(
+            "#{:form_observations_projects_out_of_range.t(
+              date: @observation.when,
+              place_name: @observation.place_name
+            )}:"
+          ) %>
+          <ul>
+            <% @suspect_checked_projects.each do |proj| %>
+              <%= tag.li("#{proj.title} (#{proj.constraints})") %>
+            <% end %>
+          </ul>
+          <%= tag.p(
+            :form_observations_projects_out_of_range_help.
+              t(button_name: button_name)
+          )%>
+        </div>
+        <%= check_box_with_label(
+          form: f_p, field: :ignore_proj_conflicts,
+          label: :form_observations_projects_ignore_project_constraints.t
+        ) %>
+      </div>
+    <% end %>
     <div class="col-xs-12 col-sm-6 col-sm-push-6">
       <%= help_block_with_arrow("left", id: "project_help") do %>
         <%= :form_observations_project_help.t %>