Merge branch 'master' into create-agents

app/controllers/organizations_controller.rb

@@ -2,7 +2,7 @@ class OrganizationsController < ApplicationController
 
   before_action :set_organization, only: :show
 
-  autocomplete :organization, :name
+  autocomplete :organization, :name, :display_value => :fullname
 
   def index
     @organizations = search(params)

app/models/organization.rb

@@ -54,7 +54,7 @@ class Organization < ActiveRecord::Base
   scope :invalidated, -> { where('invalidated_at is not null') }
   scope :validated, -> { where('invalidated_at is null') }
   scope :lobbies, -> { where('entity_type = ?', 2) }
-  scope :full_like, ->(name) { where("identifier ilike ? OR name ilike ?", name, name) }
+  scope :full_like, ->(name) { where("identifier ilike ? OR name ilike ? OR first_surname ilike ?", name, name, name) }
 
   def entity_type_id
     Organization.entity_types[entity_type]

spec/features/organizations_spec.rb

@@ -608,6 +608,17 @@
       expect(page).to have_content "New text public assignments"
     end
 
+    scenario "Should not display organization agent info allow_public_data: false" do
+      organization = create(:organization)
+      agent1 = create(:agent, organization: organization, to: Date.current, allow_public_data: true)
+      agent2 = create(:agent, organization: organization, to: Date.current, allow_public_data: false)
+
+      visit organization_path(organization)
+
+      expect(page).to have_content agent1.name
+      expect(page).not_to have_content agent2.name
+    end
+
     scenario "Should display canceled organization but not display agent info" do
       organization = create(:organization, canceled_at: Date.current)
       agent = create(:agent, organization: organization)