iqvoc 4.13.2 → 4.14.4

data/app/helpers/rdf_helper.rb

@@ -46,7 +46,7 @@ module RdfHelper
       end
 
       c.Schema::expires(concept.expired_at.to_s) if concept.expired_at
-      c.Owl::deprecated(true) if concept.expired_at and concept.expired_at <= Date.new
+      c.Owl::deprecated(true) if concept.expired?
 
       c.Skos::topConceptOf IqRdf.build_uri(Iqvoc::Concept.root_class.instance.origin) if concept.top_term?
       c.Skos::inScheme IqRdf.build_uri(Iqvoc::Concept.root_class.instance.origin)
@@ -59,8 +59,10 @@ module RdfHelper
         relation.build_rdf(document, c, suppress_extra_labels)
       end
 
-      concept.notes.each do |note|
-        note.build_rdf(document, c)
+      if Iqvoc::rdf_show_change_notes
+        concept.notes.each do |note|
+          note.build_rdf(document, c)
+        end
       end
 
       concept.matches.each do |match|
@@ -93,8 +95,10 @@ module RdfHelper
         labeling.build_rdf(document, c)
       end
 
-      collection.note_skos_definitions.each do |note|
-        note.build_rdf(document, c)
+      if Iqvoc::rdf_show_change_notes
+        collection.note_skos_definitions.each do |note|
+          note.build_rdf(document, c)
+        end
       end
 
       collection.concepts.each do |concept|

data/app/jobs/reverse_match_job.rb

@@ -38,11 +38,15 @@ class ReverseMatchJob < Struct.new(:type, :concept,  :match_class, :subject, :ob
     error_type = nil
 
     case exception
-    when Faraday::Error::ConnectionFailed
-      error_type = 'connection_failed'
-    when Faraday::Error::TimeoutError
+    when Faraday::ConnectionFailed
+      if exception&.wrapped_exception.class == Net::OpenTimeout
+        error_type = 'timeout_error'
+      else
+        error_type = 'connection_failed'
+      end
+    when Faraday::TimeoutError
       error_type = 'timeout_error'
-    when Faraday::Error::ResourceNotFound
+    when Faraday::ResourceNotFound
       error_type = 'resource_not_found'
     when Faraday::ClientError
       body = exception.response[:body] || {}

data/app/models/ability.rb

@@ -6,6 +6,7 @@ class Ability
   def initialize(user = nil)
     can :read, Iqvoc::Concept.root_class.instance
     can :read, [::Concept::Base, ::Collection::Base, ::Label::Base], &@@if_published
+    can :read, ::Note::Base
 
     # static pages
     can :read, :help
@@ -23,11 +24,10 @@ class Ability
       if user.owns_role?(:editor) || user.owns_role?(:publisher) || user.owns_role?(:administrator) # Editors and above ...
         can :read, [::Concept::Base, ::Collection::Base, ::Label::Base]
         can :create, [::Concept::Base, ::Collection::Base, ::Label::Base]
-        can [:update, :destroy, :unlock], [::Concept::Base, ::Collection::Base, ::Label::Base], locked_by: user.id, published_at: nil
-        can :lock, [::Concept::Base, ::Collection::Base, ::Label::Base], locked_by: nil, published_at: nil
+        can [:update, :destroy], [::Concept::Base, ::Collection::Base, ::Label::Base], published_at: nil
         can :check_consistency, [::Concept::Base, ::Collection::Base, ::Label::Base], published_at: nil
         can :send_to_review, [::Concept::Base, ::Collection::Base, ::Label::Base] do |object|
-          !object.in_review? && object.locked_by == user.id
+          !object.in_review?
         end
         can :branch, [::Concept::Base, ::Collection::Base, ::Label::Base], &@@if_published
       end
@@ -35,19 +35,19 @@ class Ability
       if user.owns_role?(:match_editor)
         can :read, ::Concept::Base
         can :create, ::Concept::Base
-        can [:update, :lock], ::Concept::Base, locked_by: user.id, published_at: nil
-        can :lock, ::Concept::Base, locked_by: nil, published_at: nil
+        can :update, ::Concept::Base, published_at: nil
+        can :lock, ::Concept::Base, published_at: nil
         can :branch, ::Concept::Base, &@@if_published
       end
 
       if user.owns_role?(:publisher) || user.owns_role?(:administrator) # Publishers and above ...
         can :merge, [::Concept::Base, ::Collection::Base, ::Label::Base] do |object|
-          !object.published? && (!object.locked? || object.locked_by == user.id)
+          !object.published?
         end
       end
 
       if user.owns_role?(:administrator)
-        can [:update, :destroy, :unlock], [::Concept::Base, ::Label::Base], published_at: nil # Mustn't be locked by myself
+        can [:update, :destroy], [::Concept::Base, ::Label::Base], published_at: nil
 
         can :manage, User
         can :manage, Iqvoc.config

data/app/models/collection/base.rb

@@ -42,6 +42,16 @@ class Collection::Base < Concept::Base
       through: :parent_collection_members,
       source: 'collection'
 
+  has_many :concepts,
+           -> { where("concepts.type = ?", Iqvoc::Concept.base_class) },
+           through: :members,
+           source: :target
+
+  has_many :subcollections,
+           -> { where("concepts.type = ?", Iqvoc::Collection.base_class) },
+           through: :members,
+           source: :target
+
   include_to_deep_cloning(:members)
 
   # ********** Hooks
@@ -57,6 +67,13 @@ class Collection::Base < Concept::Base
 
   validate :circular_subcollections
 
+  def self.with_pref_labels
+    preload(:pref_labels)
+      .joins(:pref_labels)
+      .references(:collection_members)
+      .distinct
+  end
+
   def self.by_origin(origin)
     where(origin: origin)
   end
@@ -91,14 +108,6 @@ class Collection::Base < Concept::Base
     'collection_path'
   end
 
-  def subcollections
-    members.map(&:target).compact.select { |m| m.is_a?(::Collection::Base) }
-  end
-
-  def concepts
-    members.map(&:target).compact.reject { |m| m.is_a?(::Collection::Base) }
-  end
-
   def to_param
     origin
   end

data/app/models/concept/base.rb

@@ -289,6 +289,16 @@ class Concept::Base < ApplicationRecord
     through: :alt_labelings,
     source: :target
 
+  has_many :hidden_labelings,
+           foreign_key: 'owner_id',
+           class_name: Iqvoc::Concept.hidden_labeling_class_name,
+           inverse_of: :owner
+
+  has_many :hidden_labels,
+           -> { order(:value) },
+           through: :hidden_labelings,
+           source: :target
+
   Iqvoc::Concept.labeling_class_names.each do |labeling_class_name, languages|
     has_many labeling_class_name.to_relation_name,
       foreign_key: 'owner_id',
@@ -359,12 +369,12 @@ class Concept::Base < ApplicationRecord
   # ********** Scopes
 
   def self.expired(time = Time.now)
-    where(arel_table[:expired_at].lt(time))
+    where(arel_table[:expired_at].lteq(time))
   end
 
   def self.not_expired(time = Time.now)
     col = arel_table[:expired_at]
-    where((col.eq(nil)).or(col.gteq(time)))
+    where((col.eq(nil)).or(col.gt(time)))
   end
 
   def self.tops
@@ -385,13 +395,13 @@ class Concept::Base < ApplicationRecord
   end
 
   def self.with_pref_labels
-    includes(:pref_labels).
-    order(Arel.sql("LOWER(#{Label::Base.table_name}.value)")).
-    where(labelings: { type: Iqvoc::Concept.pref_labeling_class_name }) # This line is just a workaround for a Rails Bug. TODO: Delete it when the Bug is fixed
+    preload(:pref_labels)
+      .joins(:pref_labels)
+      .order(Arel.sql("LOWER(#{Label::Base.table_name}.value)"))
   end
 
   def self.for_dashboard
-    unpublished_or_follow_up.includes(:pref_labels, :locking_user)
+    unpublished_or_follow_up.includes(:pref_labels)
   end
 
   def self.parentless
@@ -565,7 +575,7 @@ class Concept::Base < ApplicationRecord
   end
 
   def expired?
-    self.expired_at && self.expired_at < Date.today
+    self.expired_at && self.expired_at <= Date.today
   end
 
   private

data/app/models/concept/relation/base.rb

@@ -73,7 +73,7 @@ class Concept::Relation::Base < ApplicationRecord
   end
 
   def self.target_in_edit_mode
-    joins(:target).merge(Concept::Base.in_edit_mode).references(:concepts)
+    joins(:target).merge(Concept::Base.unpublished).references(:concepts)
   end
 
   # ********* Methods

data/app/models/concept/relation/reverse_relation_extension.rb

@@ -25,9 +25,11 @@ module Concept
           attributes = attributes.except(:rank) unless relation_class.rankable?
           scope.any? || scope.create!(attributes)
 
-          # The reverse direction
-          scope = relation_class.reverse_relation_class.where(owner_id: target_concept.id, target_id: proxy_association.owner.id)
-          scope.any? || scope.create!(attributes)
+          if relation_class.bidirectional?
+            # The reverse direction
+            scope = relation_class.reverse_relation_class.where(owner_id: target_concept.id, target_id: proxy_association.owner.id)
+            scope.any? || scope.create!(attributes)
+          end
         end
       end
 
@@ -38,8 +40,10 @@ module Concept
             relation.destroy
           end
 
-          relation_class.reverse_relation_class.where(owner_id: target_concept.id, target_id: proxy_association.owner.id).load.each do |relation|
-            relation.destroy
+          if relation_class.bidirectional?
+            relation_class.reverse_relation_class.where(owner_id: target_concept.id, target_id: proxy_association.owner.id).load.each do |relation|
+              relation.destroy
+            end
           end
         end
       end

data/app/models/concerns/search_extension.rb

@@ -22,27 +22,10 @@ module SearchExtension
   end
 
   module ClassMethods
-    def multi_query(params = {})
-      query_terms = params[:query].split(/\r\n/)
-      results     = []
-      query_terms.each do |term|
-        results << { query: term, result: single_query(params.merge({ query: term })) }
-      end
-      results
-    end
-
     def single_query(params = {})
       raise NotImplementedError.new("Implement self.single_query in your specific class (#{self.name}) that should be searchable!")
     end
 
-    def supports_multi_query?
-      false
-    end
-
-    def forces_multi_query?
-      false
-    end
-
     def build_query_string(params = {})
       query_str = params[:query].strip
       query_str = "%#{query_str}" if ['contains', 'ends_with'].include?(params[:query_type].to_s)

data/app/models/concerns/versioning.rb

@@ -25,11 +25,6 @@ module Versioning
                class_name: name,
                optional: true
 
-    belongs_to :locking_user,
-               foreign_key: 'locked_by',
-               class_name: 'AbstractUser',
-               optional: true
-
     after_initialize do
       disable_validations_for_publishing
     end
@@ -48,10 +43,6 @@ module Versioning
       where(published_at: nil)
     end
 
-    def locked
-      where(arel_table[:locked_by].not_eq(nil))
-    end
-
     def published_with_newer_versions
       # published objects without objects which have a new one in editing
       published_objects = arel_table[:published_at].not_eq(nil).and(arel_table[:origin].not_in(unpublished.map(&:origin)))
@@ -70,10 +61,6 @@ module Versioning
       )
     end
 
-    def in_edit_mode
-      where(arel_table[:locked_by].not_eq(nil))
-    end
-
     def unpublished_or_follow_up
       where(
         arel_table[:published_at].eq(nil).or(
@@ -99,9 +86,8 @@ module Versioning
     end
   end # module ClassMethods
 
-  def branch(user)
+  def branch
     new_version = self.deep_clone(include: self.class.includes_to_deep_cloning)
-    new_version.lock_by_user(user.id)
     new_version.increment(:rev)
     new_version.published_version_id = self.id
     new_version.unpublish
@@ -114,20 +100,10 @@ module Versioning
     published? || read_attribute(:published_version_id).blank?
   end
 
-  def lock_by_user(user_id)
-    tap do
-      write_attribute(:locked_by, user_id)
-    end
-  end
-
   def never_published?
     unpublished? && rev == 1
   end
 
-  def locked?
-    locked_by?
-  end
-
   def state
     if published?
       I18n.t('txt.common.state.published')
@@ -138,12 +114,6 @@ module Versioning
     end
   end
 
-  def unlock
-    tap do
-      write_attribute(:locked_by, nil)
-    end
-  end
-
   def in_review?
     read_attribute(:to_review).present?
   end

data/app/models/dataset/adaptors/iqvoc/alphabetical_search_adaptor.rb

@@ -12,8 +12,8 @@ class Dataset::Adaptors::Iqvoc::AlphabeticalSearchAdaptor < Dataset::Adaptors::I
       while more = @doc.at_css('a[rel=next]')
         fetch_results(more[:href], {})
       end
-    rescue Faraday::Error::ConnectionFailed,
-      Faraday::Error::ResourceNotFound => e
+    rescue Faraday::ConnectionFailed,
+      Faraday::ResourceNotFound => e
         Rails.logger.warn("HTTP error while querying remote source #{url}: #{e.message}")
         return nil
     end

data/app/models/dataset/adaptors/iqvoc/http_adaptor.rb

@@ -15,8 +15,8 @@ class Dataset::Adaptors::Iqvoc::HttpAdaptor
   def http_get(path, redirect_count = 0)
     begin
       response = @conn.get(path)
-    rescue Faraday::Error::ConnectionFailed,
-        Faraday::Error::ResourceNotFound => e
+    rescue Faraday::ConnectionFailed,
+        Faraday::ResourceNotFound => e
       return failed_request(path)
     end
 

data/app/models/dataset/adaptors/iqvoc/search_adaptor.rb

@@ -24,8 +24,8 @@ class Dataset::Adaptors::Iqvoc::SearchAdaptor < Dataset::Adaptors::Iqvoc::HttpAd
       while more = @doc.at_css('a[rel=next]')
         fetch_results(more[:href], {})
       end
-    rescue Faraday::Error::ConnectionFailed,
-      Faraday::Error::ResourceNotFound => e
+    rescue Faraday::ConnectionFailed,
+      Faraday::ResourceNotFound => e
         Rails.logger.warn("HTTP error while querying remote source #{path}: #{e.message}")
         return nil
     end

data/app/models/export.rb

@@ -27,6 +27,6 @@ class Export < ApplicationRecord
   private
 
   def delete_dump_file
-    File.delete(build_filename) if File.exists?(build_filename)
+    File.delete(build_filename) if File.exist?(build_filename)
   end
 end

data/app/models/label/base.rb

@@ -82,7 +82,7 @@ class Label::Base < ApplicationRecord
   end
 
   def self.by_query_value(query)
-    where(["LOWER(#{table_name}.value) LIKE ?", query.mb_chars.downcase.to_s])
+    where(["#{table_name}.value ILIKE ?", query.mb_chars.downcase.to_s])
   end
 
   # Attention: This means that even label classes without version controll will also
@@ -101,6 +101,10 @@ class Label::Base < ApplicationRecord
     true
   end
 
+  def expired?
+    self.expired_at && self.expired_at < Date.today
+  end
+
   def <=>(other)
     self.to_s.downcase <=> other.to_s.downcase
   end
@@ -122,10 +126,6 @@ class Label::Base < ApplicationRecord
   end
 
   def to_s
-    if (language.presence || 'none') != I18n.locale.to_s
-      value.to_s + " [#{I18n.t('txt.common.translation_missing_for')} '#{I18n.locale}']"
-    else
       value.to_s
-    end
   end
 end

data/app/models/note/base.rb

@@ -73,7 +73,7 @@ class Note::Base < ApplicationRecord
   end
 
   def self.by_query_value(query)
-    where(["LOWER(#{table_name}.value) LIKE ?", query.mb_chars.downcase.to_s])
+    where(["#{table_name}.value ILIKE ?", query.mb_chars.downcase.to_s])
   end
 
   def self.by_owner_type(klass)

data/app/models/user.rb

@@ -3,6 +3,8 @@ class User < AbstractUser
 
   validates_inclusion_of :role, in: ROLES
   validates_length_of :forename, :surname, within: 2..255
+  validates_presence_of :email
+  validates_format_of :email, with: URI::MailTo::EMAIL_REGEXP
 
   def name
     "#{forename} #{surname}"

data/app/uploaders/rdf_uploader.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 class RdfUploader < Base
-  def extension_white_list
+  def extension_allowlist
     %w(nt)
   end
 end

data/app/views/collections/_data.html.erb

@@ -28,7 +28,7 @@
   </h2>
   <div class="relation-body">
     <ul>
-      <%- collection.concepts.sort {|a, b| a.pref_label.to_s <=> b.pref_label.to_s }.each do |concept| -%>
+      <%- collection.concepts.with_pref_labels.each do |concept| -%>
         <%- if concept.published? || (!concept.published_version_id && can?(:update, concept)) -%>
           <li><%= render concept.class.inline_partial_name, :concept => concept %></li>
         <%- end -%>
@@ -47,6 +47,6 @@
   <% end %>
   </h2>
   <ul class="hybrid-treeview" data-url="<%= collections_path(:format => :json) %>">
-    <%= render :partial => 'collection', :collection => collection.subcollections.sort {|a, b| a.pref_label <=> b.pref_label } %>
+    <%= render :partial => 'collection', :collection => collection.subcollections.with_pref_labels %>
   </ul>
 </div>

data/app/views/collections/show_unpublished.html.erb

@@ -3,9 +3,6 @@
 
 <%= alert :info, :header => t('txt.common.unpublished_version') + "." do %>
   <%= t("txt.views.versioning.current_revision", :rev => @collection.rev) %>
-  <% if @collection.locked? %>
-    <%= t("txt.views.versioning.in_ongoing_editing_by", :user => @collection.locking_user.name) %>
-  <% end %>
 <% end %>
 
 <div class="editing_versioning_toolbar">
@@ -24,15 +21,10 @@
       collection_versions_to_review_path(:origin => @collection.origin), :class => 'btn btn-outline-secondary' %>
   <% end %>
 
-  <% if @collection.locked? %>
-    <%= button_to t("txt.views.versioning.unlock"),
-      collection_versions_unlock_path(:origin => @collection.origin), :class => 'btn btn-outline-secondary' if can?(:unlock, @collection) %>
+  <% if can?(:update, @collection) %>
     <%= link_to t("txt.views.versioning.edit_mode"),
-      edit_collection_path(:published => 0, :id => @collection.origin),
-        :class => 'btn btn-outline-secondary' if can?(:update, @collection) %>
-    <% else %>
-      <%= button_to t("txt.views.versioning.to_edit_mode"),
-        collection_versions_lock_path(:origin => @collection.origin), :class => 'btn btn-outline-secondary' if can?(:lock, @collection) %>
+                edit_collection_path(:published => 0, :id => @collection.origin),
+                :class => 'btn btn-outline-secondary'  %>
   <% end %>
 
   <% if can?(:destroy, @collection) %>

data/app/views/concepts/notifications/_referenced_concepts.html.erb

@@ -6,7 +6,6 @@
         <%= concept_relation.class.model_name.human %>
         <%= link_to(concept_relation.target.pref_label.to_s,
           concept_path(:published => 0, :id => concept_relation.target)) %>
-        <%= t("txt.common.editor") %> <%= user_details(concept_relation.target.locking_user) %>
       </li>
     <% end %>
   </ul>

data/app/views/concepts/show_published.html.erb

@@ -1,6 +1,8 @@
 <%= render 'header', :concept => @concept %>
 <%= render 'concepts/sidebars/singular', :concept => @concept %>
 
+<%= error_messages_for @concept %>
+
 <% if @new_concept_version.blank? && can?(:branch, @concept) %>
   <% if @jobs && @jobs.any? %>
     <%= render partial: 'partials/concept/reverse_match_notice', locals: {concept: @concept, jobs: @jobs} %>

data/app/views/concepts/show_unpublished.html.erb

@@ -1,11 +1,10 @@
 <%= render 'header', :concept => @concept %>
 <%= render 'concepts/sidebars/singular', :concept => @concept %>
 
+<%= error_messages_for @concept %>
+
 <%= alert :info, :header => t('txt.common.unpublished_version') + "." do %>
   <%= t("txt.views.versioning.current_revision", :rev => @concept.rev) %>
-  <% if @concept.locked? %>
-    <%= t("txt.views.versioning.in_ongoing_editing_by", :user => @concept.locking_user.name) %>
-  <% end %>
 <% end %>
 
 <% if @jobs && @jobs.any? %>
@@ -28,15 +27,10 @@
       concept_versions_to_review_path(:origin => @concept.origin), :class => 'btn btn-outline-secondary' %>
   <% end %>
 
-  <% if @concept.locked? %>
-    <%= button_to t("txt.views.versioning.unlock"),
-      concept_versions_unlock_path(:origin => @concept.origin), :class => 'btn btn-outline-secondary' if can?(:unlock, @concept) %>
+  <% if can?(:update, @concept) %>
     <%= link_to t("txt.views.versioning.edit_mode"),
-      edit_concept_path(:published => 0, :id => @concept.origin),
-      :class => 'btn btn-outline-secondary' if can?(:update, @concept) %>
-  <% elsif can?(:lock, @concept) %>
-    <%= button_to t("txt.views.versioning.to_edit_mode"),
-      concept_versions_lock_path(:origin => @concept.origin), :class => 'btn btn-outline-secondary' %>
+                edit_concept_path(:published => 0, :id => @concept.origin),
+                :class => 'btn btn-outline-secondary' if can?(:update, @concept) %>
   <% end %>
 
   <% if can?(:destroy, @concept) %>

data/app/views/dashboard/_table.html.erb

@@ -2,7 +2,6 @@
   <thead>
     <tr>
       <th><%= t("txt.views.dashboard.value") %><%= sorting_controls_for(:value) %></th>
-      <th><%= t("txt.views.dashboard.locking_user") %><%= sorting_controls_for(:locking_user) %></th>
       <% unless @items.first.class == Iqvoc::Collection.base_class %>
         <th><%= t("txt.views.dashboard.follow_up") %><%= sorting_controls_for(:follow_up) %></th>
       <% end %>
@@ -22,13 +21,6 @@
           <%= render item.class.edit_link_partial_name, :item => item %>
           <a href="<%= dashboard_glance_path(type: item.class, origin: item.origin, published: item.published? ? 1 : 0) %>" class="dashboard-glance-link"><i class="fa fa-search-plus"></i></a>
         </td>
-        <td>
-        <% if item.locking_user.present? %>
-          <span class="badge badge-info" data-toggle="tooltip" data-placement="top" title="<%= item.locking_user.name %>">
-            <%= item.locking_user.initials %>
-          </span>
-        <% end %>
-        </td>
         <% unless item.class == Iqvoc::Collection.base_class %>
           <td class="<%= 'dashboard-activated-follow-up-column' if item.follow_up.present? %>">
             <%= l(item.follow_up) if item.follow_up.present? %>

data/app/views/pages/version.html.erb

@@ -6,7 +6,7 @@
   <dd class="col-md-10"><%= "#{Iqvoc.host_namespace} #{Iqvoc.host_version}" %></dd>
   <% end %>
 
-  <% if File.exists?(Rails.root.join('headrev.txt')) %>
+  <% if File.exist?(Rails.root.join('headrev.txt')) %>
     <dt class="col-md-2">Revision</dt>
     <dd class="col-md-10"><%= File.read(Rails.root.join('headrev.txt')) %></dd>
   <% end %>

data/app/views/partials/concept/_edit_link_base.html.erb

@@ -1,5 +1,5 @@
-<% label = item.pref_label.to_s.presence || ":#{item.origin} [#{t("txt.common.translation_missing_for")} #{[I18n.locale.to_s, Iqvoc::Concept.pref_labeling_languages.first.to_s].uniq.join(", ")}]" %>
+<% label = item.pref_label.to_s.presence || ":#{item.origin}" %>
 <%= link_to truncate(label, :length => 45), (item.published? ? concept_path(:id => item.origin) : concept_path(:published => 0, :id => item.origin)) %>
-<%- if (item.additional_info) -%>
+<%- if item.additional_info -%>
   (<%= item.additional_info %>)
 <%- end -%>

data/app/views/partials/concept/relation/_edit_base.html.erb

@@ -1,13 +1,16 @@
 <%- fieldname = "concept[concept_relations_by_id][#{klass.name.to_relation_name}]" -%>
-<%= f.form_group nil, :label => { :text => klass.model_name.human(:count => klass.singular? ? 1 : 2) } do %>
+<%= f.form_group nil, label: { text: klass.model_name.human(count: klass.singular? ? 1 : 2) } do %>
   <%= text_field_tag fieldname, widget_values(concept, klass),
-    :id => klass.name.to_relation_name,
-    :class => "entity_select",
-    :"data-query-url" => concepts_path(:format => :json,
-    :exclude_top_terms => klass != Iqvoc::Concept.broader_relation_class || nil),
-    :"data-entity-uri" => concept_path("{id}"),
-    :"data-singular" => klass.singular? || nil,
-    :"data-entities" => widget_entities(concept, klass),
-    :'data-no-results-msg' => t('txt.views.search_results.no_results')
-     %>
+                     id: klass.name.to_relation_name,
+                     class: "entity_select",
+                     "data-query-url": concepts_path(
+                       format: :json,
+                       exclude_top_terms: klass != Iqvoc::Concept.broader_relation_class || nil,
+                       language: params[:lang]
+                     ),
+                     "data-entity-uri": concept_path("{id}"),
+                     "data-singular": klass.singular? || nil,
+                     "data-entities": widget_entities(concept, klass),
+                     'data-no-results-msg': t('txt.views.search_results.no_results')
+  %>
 <% end %>

data/app/views/search_results/_detailed_search.html.erb

@@ -0,0 +1,27 @@
+<div class="row">
+  <div class="col-md-6">
+    <%= render "search_results/sections/mode" %>
+  </div>
+  <div class="col-md-6">
+    <%= render "search_results/sections/klass" %>
+  </div>
+</div>
+<div class="row">
+  <div class="col-md-6">
+    <%= render "search_results/sections/type" %>
+  </div>
+  <div class="col-md-6">
+    <%= render "search_results/sections/collection" %>
+  </div>
+</div>
+<div class="row">
+  <%= render "search_results/sections/change_note" %>
+</div>
+<div class="row">
+  <div class="col-md-6">
+    <%= render "search_results/sections/datasets" %>
+  </div>
+  <div class="col-md-6">
+    <%= render "search_results/sections/options" %>
+  </div>
+</div>