changes

GovWifi · Feb 20, 2024 · f0c55c8 · f0c55c8
1 parent 97e946f
commit f0c55c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/app/controllers/super_admin/organisations_controller.rb b/app/controllers/super_admin/organisations_controller.rb
@@ -1,7 +1,7 @@
 class SuperAdmin::OrganisationsController < SuperAdminController
   helper_method :sort_column, :sort_direction
 
-  before_action :set_organisation, only: %i[show destroy toggle_cba_feature]
+  before_action :set_organisation, only: %i[toggle_cba_feature]
 
   def index
     @organisations = Organisation.sortable_with_child_counts(sort_column, sort_direction)
@@ -40,6 +40,10 @@ def toggle_cba_feature
 
 private
 
+  def set_organisation
+    @organisation = Organisation.find(params[:id])
+  end
+
   def sortable_columns
     %w[name created_at locations_count ips_count active_storage_attachments.created_at last_sign_in_at email sign_in_count]
   end

diff --git a/app/views/logs/index.html.erb b/app/views/logs/index.html.erb
@@ -32,10 +32,7 @@
     <thead class="govuk-table__head">
       <tr class="govuk-table__row">
         <% unless log_search_form.username %>
-          <th class="govuk-table__header" scope="col">Username or ID</th>
-        <% end %>
-        <% if log_search_form.ip && current_organisation&.cba_enabled? %>
-          <th class="govuk-table__header" scope="col">Authentication Method</th>
+          <th class="govuk-table__header" scope="col">Username</th>
         <% end %>
         <th class="govuk-table__header" scope="col">Access Point</th>
         <th class="govuk-table__header" scope="col">MAC Address</th>
@@ -62,9 +59,7 @@
               <% end %>
             </td>
           <% end %>
-          <% if log_search_form.ip && current_organisation&.cba_enabled? %>
-            <td class="govuk-table__cell"><%= log.cert_name %></td>
-          <% end %>
+
           <td class="govuk-table__cell"><%= log.ap %></td>
           <td class="govuk-table__cell"><%= log.mac %></td>
           <% unless log_search_form.ip %>

diff --git a/spec/features/logging/view_auth_requests_for_an_ip_spec.rb b/spec/features/logging/view_auth_requests_for_an_ip_spec.rb
@@ -9,8 +9,8 @@
     let(:ip) { location.ips.first.address }
     let(:location) { user.organisations.first.locations.first }
     before do
-      create(:organisation, :with_location_and_ip, users: [user], cba_enabled: true)
-      create(:session, siteIP: ip, username: "Aaaaaa", cert_name: "EAP-TLS")
+      create(:organisation, :with_location_and_ip, users: [user])
+      create(:session, siteIP: ip, username: "Aaaaaa")
     end
     describe "when using a link" do
       before do