Cleanup after condtions/_form refactor

-  ` action_type_arr` and `remove_question_group` are only needed in `conditions/_new_condition_form.erb`. The assignments have been moved directly to that partial.
- -  ` view_email_content_info` is only needed in `conditions/_new_condition_form.erb`. The assignment has been moved directly to that partial.

Author: aaronskiba

app/views/org_admin/conditions/_existing_condition_display.erb

@@ -1,6 +1,7 @@
     <%
     qopt = condition[:question_option_id].any? ? QuestionOption.find_by(id: condition[:question_option_id].first): nil
     rquesArray = condition[:remove_question_id].any? ? Question.where(id: condition[:remove_question_id]) : nil
+    view_email_content_info = _("Hover over the email address to view email content. To change email details you need to remove and add the condition again.")
     %>
     <div class="col-md-3 pe-2">
       <%= qopt[:text]&.slice(0, 25) %>

app/views/org_admin/conditions/_form.html.erb

@@ -3,40 +3,29 @@
     - app/views/org_admin/conditions/_container.html.erb
     %>
 
-<% condition ||= nil %>
-
 <div class="row condition-partial mb-3">
   <%
-    action_type_arr = [["removes", :remove], ["adds notification", :add_webhook]]
+    condition ||= nil
     name_start = "conditions[#{condition_no.to_s}]"
-    remove_question_collection = later_question_list(question)
-    remove_question_group = grouped_options_for_select(remove_question_collection)
-    view_email_content_info = _("Hover over the email address to view email content. To change email details you need to remove and add the condition again.")
   %>
 
   <%# If this is a new condition then display the interactive controls. otherwise just display the logic %>
   <% if condition.nil? %>
     <%= render partial: 'org_admin/conditions/new_condition_form',
-                locals: { action_type_arr: action_type_arr,
-                          condition_no: condition_no,
-                          question: question,
+                locals: { condition_no: condition_no,
                           name_start: name_start,
-                          remove_question_group: remove_question_group,
-                          view_email_content_info: view_email_content_info
+                          question: question
                         }
       %>
 
   <% else %>
-  <%= render partial: 'org_admin/conditions/existing_condition_display',
-              locals: { action_type_arr: action_type_arr,
-                        condition: condition,
-                        condition_no: condition_no,
-                        name_start: name_start,
-                        question: question,
-                        remove_question_group: remove_question_group,
-                        view_email_content_info: view_email_content_info
-                      }
-    %>
+    <%= render partial: 'org_admin/conditions/existing_condition_display',
+                locals: { condition: condition,
+                          condition_no: condition_no,
+                          name_start: name_start,
+                          question: question
+                        }
+      %>
 
   <% end %>
 </div>

app/views/org_admin/conditions/_new_condition_form.erb

@@ -1,3 +1,9 @@
+  <%
+    action_type_arr = [["removes", :remove], ["adds notification", :add_webhook]]
+    remove_question_collection = later_question_list(question)
+    remove_question_group = grouped_options_for_select(remove_question_collection)
+  %>
+
   <div class="form-label bold">Add condition</div>
   <div class="row  mb-3">
     <div class="col-md-9 pe-2">