Not sure why rebasing removed the policy_scope change. Otherwise this…

… is 99% ready lol
geeksforsocialchange · Jan 24, 2022 · 5a7ec8c · 5a7ec8c
1 parent 811b31a
commit 5a7ec8c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb
@@ -58,7 +58,7 @@ def set_site
     end
 
     def set_variables_for_sites_neighbourhoods_selection
-      @all_neighbourhoods = policy_scope(Neighbourhood).order(:name).where(unit: 'ward')
+      @all_neighbourhoods = policy_scope(Neighbourhood).order(:name)
       begin
         set_site
       rescue ActiveRecord::RecordNotFound

diff --git a/app/views/admin/sites/_form.html.erb b/app/views/admin/sites/_form.html.erb
@@ -68,6 +68,7 @@
     <div class="links">
       <%= link_to_add_association 'Add secondary', f, :sites_neighbourhoods, class: "btn btn-primary" %>
     </div>
+    <br></br>
   </div>
 
   <%= f.button :submit, class: "btn btn-primary " %>

diff --git a/app/views/admin/sites/_sites_neighbourhood_fields.html.erb b/app/views/admin/sites/_sites_neighbourhood_fields.html.erb
@@ -1,5 +1,7 @@
 <div class="nested-fields">
-    <%= f.input :name, collection: options_for_sites_neighbourhoods, include_blank: false %>
+    <%= f.input :name, collection: options_for_sites_neighbourhoods, include_blank: false,
+                input_html: { class: 'form-control' } %>
     <%= f.hidden_field :relation_type, value: 'Secondary' %>
     <%= link_to_remove_association 'Remove Secondary Neighbourhood', f, class: "btn btn-danger" %>
+    <br></br>
 </div>