iqvoc 4.13.0 → 4.14.4

data/app/controllers/concepts/versions_controller.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 class Concepts::VersionsController < ApplicationController
-  include RDFSyncService::Helper
+  include RdfSyncService::Helper
 
   def merge
     concept_scope = Iqvoc::Concept.base_class.by_origin(params[:origin])
@@ -33,7 +33,7 @@ class Concepts::VersionsController < ApplicationController
     ActiveRecord::Base.transaction do
       new_version.rdf_updated_at = nil
       new_version.publish
-      new_version.unlock
+
       if new_version.publishable?
         new_version.save
 
@@ -68,7 +68,7 @@ class Concepts::VersionsController < ApplicationController
 
       new_version = nil
       ActiveRecord::Base.transaction do
-        new_version = current_concept.branch(current_user)
+        new_version = current_concept.branch
         new_version.save!
         Iqvoc.change_note_class.create! do |note|
           note.owner = new_version
@@ -85,45 +85,6 @@ class Concepts::VersionsController < ApplicationController
     end
   end
 
-  def lock
-    new_version = Iqvoc::Concept.base_class.
-        by_origin(params[:origin]).
-        unpublished.
-        last!
-
-    if new_version.locked?
-      raise "Concept with origin '#{new_version.origin}' is already locked."
-    end
-
-    authorize! :lock, new_version
-
-    new_version.lock_by_user(current_user.id)
-    new_version.save validate: false
-
-    flash[:success] = t('txt.controllers.versioning.locked')
-    redirect_to edit_concept_path(published: 0, id: new_version)
-  end
-
-  def unlock
-    new_version = Iqvoc::Concept.base_class.
-        by_origin(params[:origin]).
-        unpublished.
-        last!
-
-    unless new_version.locked?
-      raise "Concept with origin '#{new_version.origin}' is not locked."
-    end
-
-    authorize! :unlock, new_version
-
-    new_version.unlock
-    new_version.save validate: false
-
-    flash[:success] = t('txt.controllers.versioning.unlocked')
-
-    redirect_to concept_path(published: 0, id: new_version)
-  end
-
   def consistency_check
     concept = Iqvoc::Concept.base_class.
         by_origin(params[:origin]).
@@ -137,7 +98,7 @@ class Concepts::VersionsController < ApplicationController
       redirect_to concept_path(published: 0, id: concept)
     else
       flash[:error] = t('txt.controllers.versioning.consistency_check_error')
-      redirect_to edit_concept_path(published: 0, id: concept, full_consistency_check: '1')
+      redirect_to concept_path(published: 0, id: concept, full_consistency_check: '1')
     end
   end
 
@@ -148,13 +109,17 @@ class Concepts::VersionsController < ApplicationController
         last!
 
     authorize! :send_to_review, concept
-    concept.to_review
 
-    authorize! :unlock, concept
-    concept.unlock
+    # Only send the concept to review if it is publishable (e.g. consistency check is OK)
+    if concept.publishable?
+      concept.to_review
+      concept.save!
 
-    concept.save!
-    flash[:success] = t('txt.controllers.versioning.to_review_success')
-    redirect_to concept_path(published: 0, id: concept)
+      flash[:success] = t('txt.controllers.versioning.to_review_success')
+      redirect_to concept_path(published: 0, id: concept)
+    else
+      flash[:error] = t('txt.controllers.versioning.consistency_check_error')
+      redirect_to concept_path(published: 0, id: concept, full_consistency_check: '1')
+    end
   end
 end

data/app/controllers/concepts_controller.rb

@@ -28,10 +28,16 @@ class ConceptsController < ApplicationController
         redirect_to hierarchical_concepts_url
       end
       format.json do # Search for widget
-        scope = Iqvoc::Concept.base_class.editor_selectable.with_pref_labels.
-            merge(Label::Base.by_query_value("%#{params[:query]}%"))
+        labels_scope = Label::Base.by_query_value("%#{params[:query]}%")
+        labels_scope = labels_scope.merge(Label::Base.by_language(params[:language])) if params[:language].present?
+
+        scope = Iqvoc::Concept.base_class
+                              .editor_selectable
+                              .with_pref_labels
+                              .merge(labels_scope)
         scope = scope.where(top_term: false) if params[:exclude_top_terms]
-        @concepts = scope.all.map { |concept| concept_widget_data(concept) }
+
+        @concepts = scope.uniq.map { |concept| concept_widget_data(concept) }
         render json: @concepts
       end
     end
@@ -41,6 +47,10 @@ class ConceptsController < ApplicationController
     get_concept
     authorize! :read, @concept
 
+    if params[:full_consistency_check] && can?(:check_consistency, @concept)
+      @concept.publishable?
+    end
+
     @datasets = datasets_as_json
     respond_to do |format|
       format.html do
@@ -63,19 +73,19 @@ class ConceptsController < ApplicationController
           end
         end
 
-        # When in single query mode, AR handles ALL includes to be loaded by that
-        # one query. We don't want that! So let's do it manually :-)
-        ActiveRecord::Associations::Preloader.new.preload(@concept,
-          Iqvoc::Concept.base_class.default_includes + [collection_members: { collection: :labels },
+        Iqvoc::Concept.base_class.preload(
+          @concept, Iqvoc::Concept.base_class.default_includes + [
+          collection_members: { collection: :labels },
           broader_relations: { target: [:pref_labels, :broader_relations] },
-          narrower_relations: { target: [:pref_labels, :narrower_relations] }])
+          narrower_relations: { target: [:pref_labels, :narrower_relations] }
+        ])
 
         @published ? render('show_published') : render('show_unpublished')
       end
       format.json do
         # When in single query mode, AR handles ALL includes to be loaded by that
         # one query. We don't want that! So let's do it manually :-)
-        ActiveRecord::Associations::Preloader.new.preload(@concept, [:labels,
+        Iqvoc::Concept.base_class.preload(@concept, [:labels,
             { relations: { target: [:labelings, :relations] } }])
 
         published_relations = lambda { |concept|
@@ -147,12 +157,10 @@ class ConceptsController < ApplicationController
     authorize! :create, Iqvoc::Concept.base_class
 
     @concept = Iqvoc::Concept.base_class.new
-    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.protocol)
+    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.protocol) if match_sync_enabled?
     @concept.assign_attributes(concept_params)
     @datasets = datasets_as_json
 
-    @concept.lock_by_user(current_user.id)
-
     if @concept.save
       flash[:success] = I18n.t('txt.controllers.versioned_concept.success')
       redirect_to concept_path(published: 0, id: @concept.origin)
@@ -169,10 +177,6 @@ class ConceptsController < ApplicationController
 
     @association_objects_in_editing_mode = @concept.associated_objects_in_editing_mode
 
-    if params[:full_consistency_check]
-      @concept.publishable?
-    end
-
     Iqvoc::Concept.note_class_names.each do |note_class_name|
       @concept.send(note_class_name.to_relation_name).build if @concept.send(note_class_name.to_relation_name).empty?
     end
@@ -185,14 +189,14 @@ class ConceptsController < ApplicationController
   def update
     @concept = Iqvoc::Concept.base_class.by_origin(params[:id]).unpublished.last!
     authorize! :update, @concept
-    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.protocol)
+    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.protocol) if match_sync_enabled?
 
     @datasets = datasets_as_json
 
     # set to_review to false if someone edits a concepts
     concept_params["to_review"] = "false"
 
-    if @concept.update_attributes(concept_params)
+    if @concept.update(concept_params)
       flash[:success] = I18n.t('txt.controllers.versioned_concept.update_success')
       redirect_to concept_path(published: 0, id: @concept)
     else
@@ -247,4 +251,10 @@ class ConceptsController < ApplicationController
       # TODO: relations (XL only)
     }
   end
+
+  private
+
+  def match_sync_enabled?
+    Iqvoc.config['sources.create_reverse_matches']
+  end
 end

data/app/controllers/concepts_movement_controller.rb

@@ -70,7 +70,7 @@ class ConceptsMovementController < ApplicationController
       result = draft.first
     else
       # create a new version
-      result = concept.branch(current_user)
+      result = concept.branch
       result.save!
     end
 

data/app/controllers/dashboard_controller.rb

@@ -28,9 +28,9 @@ class DashboardController < ApplicationController
       order_params = params[:sort]
       #FIXME: how to order by state in database?
       order_params = sanatize_order order_params
-      order_params = order_params.gsub('value', 'labels.value').gsub('locking_user', 'users.surname').gsub('follow_up', 'concepts.follow_up').gsub('updated_at', 'concepts.updated_at')
+      order_params = order_params.gsub('value', 'labels.value').gsub('follow_up', 'concepts.follow_up').gsub('updated_at', 'concepts.updated_at')
 
-      concepts = concepts.includes(:pref_labels, :locking_user).references(:pref_labels).references(:locking_user).order(order_params)
+      concepts = concepts.includes(:pref_labels).references(:pref_labels).order(order_params)
     else
       concepts = concepts.includes(:pref_labels).order('labels.value')
     end
@@ -51,9 +51,9 @@ class DashboardController < ApplicationController
       collections = sort == 'DESC' ? collections.reverse : collections
     elsif params[:sort]
       order_params = sanatize_order params[:sort]
-      order_params = order_params.gsub('value', 'labels.value').gsub('locking_user', 'users.surname').gsub('updated_at', 'concepts.updated_at')
+      order_params = order_params.gsub('value', 'labels.value').gsub('updated_at', 'concepts.updated_at')
 
-      collections = collections.includes(:pref_labels, :locking_user).references(:pref_labels).references(:locking_user).order(order_params)
+      collections = collections.includes(:pref_labels).references(:pref_labels).order(order_params)
     else
       collections = collections.includes(:pref_labels).order('labels.value')
     end
@@ -102,7 +102,7 @@ class DashboardController < ApplicationController
     return '' if search_params.include?(';')
     param_array = search_params.split(',').compact.select do |order_column|
       column_and_order = order_column.split(' ')
-      column_and_order.count == 2 && ['value', 'locking_user', 'follow_up', 'updated_at'].include?(column_and_order[0]) && ['ASC', 'DESC'].include?(column_and_order[1])
+      column_and_order.count == 2 && ['value', 'follow_up', 'updated_at'].include?(column_and_order[0]) && ['ASC', 'DESC'].include?(column_and_order[1])
     end
     param_array.join(',')
   end

data/app/controllers/hierarchy_controller.rb

@@ -164,7 +164,7 @@ class HierarchyController < ApplicationController
     @relation_class = @relation_class.narrower_class unless direction == 'up'
 
     respond_to do |format|
-      format.any(:html, :rdf, :ttl) { render 'hierarchy/show' }
+      format.any(:html, :rdf, :ttl, :nt) { render 'hierarchy/show' }
     end
   end
 

data/app/controllers/imports_controller.rb

@@ -29,19 +29,22 @@ class ImportsController < ApplicationController
   end
 
   def create
-    import = Import.new(import_params)
-    import.user = current_user
+    @import = Import.new(import_params)
+    @import.user = current_user
 
-    if import.save
-      job = ImportJob.new(import, import.import_file.current_path, current_user,
-                          import.default_namespace, import.publish)
+    if @import.save
+      job = ImportJob.new(@import, @import.import_file.current_path, current_user,
+                          @import.default_namespace, @import.publish)
 
       Delayed::Job.enqueue(job)
       flash[:success] = t('txt.views.import.success')
+      redirect_to imports_path
     else
+      @imports = Import.order('id DESC')
+
       flash[:error] = t('txt.views.import.error')
+      render :index
     end
-    redirect_to imports_path
   end
 
   private

data/app/controllers/reverse_matches_controller.rb

@@ -11,10 +11,9 @@ class ReverseMatchesController < ApplicationController
     render_response :mapping_exists and return if matches
 
     ActiveRecord::Base.transaction do
-      unpublished_concept = @published_concept.branch(@botuser)
+      unpublished_concept = @published_concept.branch
       unpublished_concept.save!
       @target_match_class.constantize.create(concept_id: unpublished_concept.id, value: @uri)
-      unpublished_concept.unlock
       unpublished_concept.publish!
       @published_concept.destroy!
     end
@@ -23,7 +22,7 @@ class ReverseMatchesController < ApplicationController
   end
 
   def remove_match
-    unpublished_concept = @published_concept.branch(@botuser)
+    unpublished_concept = @published_concept.branch
     unpublished_concept.save!
     match = @target_match_class.constantize.find_by(concept_id: unpublished_concept.id, value: @uri)
     if match.nil?
@@ -32,7 +31,6 @@ class ReverseMatchesController < ApplicationController
     end
     ActiveRecord::Base.transaction do
       match.destroy!
-      unpublished_concept.unlock
       unpublished_concept.publish!
       @published_concept.destroy!
     end

data/app/controllers/search_results_controller.rb

@@ -44,6 +44,8 @@ class SearchResultsController < ApplicationController
   param 'ds[]', String ,
       desc: 'Specifies one or more external data sets (connected thesauri)'\
                'to include in search.'
+  param :include_expired, String,
+        desc: 'Specifies if expired concepts should be included (defaults to false).'
   example <<-DOC
     GET /search.ttl
     200
@@ -106,25 +108,8 @@ class SearchResultsController < ApplicationController
       end
       klass = klass.constantize
 
-      query_size = params[:query].split(/\r\n/).size
-
-      if klass.forces_multi_query? || (klass.supports_multi_query? && query_size > 1)
-        @multi_query = true
-        @results = klass.multi_query(params.merge({ languages: languages.flatten }))
-        # TODO: Add a worst case limit here; e.g. when on page 2 (per_page == 50)
-        # each sub-query has to return 100 objects at most.
-        @klass = klass
-      else
-        @multi_query = false
-        @results = klass.single_query(params.merge({ languages: languages.flatten }))
-      end
-
-      if @multi_query
-        @results = Kaminari.paginate_array(@results)
-        logger.debug('Using multi query mode')
-      else
-        logger.debug('Using single query mode')
-      end
+      @results = klass.single_query(params.merge({ languages: languages.flatten }))
+                      .filter { |search_result| result_allowed?(search_result) }
 
       if params[:limit] && Iqvoc.unlimited_search_results
         @results = @results.per(params[:limit].to_i)
@@ -176,5 +161,17 @@ class SearchResultsController < ApplicationController
     controller.params['qt'] = 'contains' if controller.params['qt'].nil?
     controller.params['for'] = 'all' if controller.params['for'].nil?
     controller.params['l'] = langs.keys if controller.params['l'].nil?
+    controller.params['include_expired'] = (controller.params['include_expired'] == "true")
+  end
+
+  private
+
+  def result_allowed?(result)
+    if result.result_object.is_a?(Labeling::Base)
+      can?(:read, result.owner)
+    else
+      can?(:read, result.result_object)
+    end
   end
+
 end

data/app/controllers/triplestore_sync_controller.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 class TriplestoreSyncController < ApplicationController
-  include RDFSyncService::Helper
+  include RdfSyncService::Helper
 
   def index
     authorize! :sync, :triplestore
@@ -40,7 +40,7 @@ class TriplestoreSyncController < ApplicationController
     end
 
     # per-class pagination
-    @candidates = RDFSyncService.candidates.map do |records|
+    @candidates = RdfSyncService.candidates.map do |records|
       records.page(params[:page])
     end
   end

data/app/controllers/users_controller.rb

@@ -50,7 +50,7 @@ class UsersController < ApplicationController
     # could not change his own role and permissions
     params = can?(:manage, User) ? user_params : user_params.except(:active, :role, :comment)
 
-    if @user.update_attributes(params)
+    if @user.update(params)
       flash[:success] = I18n.t('txt.controllers.users.successfully_updated')
       redirect_to can?(:manage, User) ? users_path : dashboard_path
     else

data/app/helpers/application_helper.rb

@@ -20,14 +20,6 @@ module ApplicationHelper
     no: '✗'
   }
 
-  def user_details(user)
-    details = mail_to(user.email, user.name)
-    if user.telephone_number?
-      details << ' ' << user.telephone_number
-    end
-    details
-  end
-
   # Formats a list of items or returns a remark if no items where given
   def item_listing(items, &block)
     return '&nbsp;'.html_safe if items.empty?
@@ -54,16 +46,19 @@ module ApplicationHelper
     end
   end
 
-  def page_header(args = {})
+  def page_header(args = {}, &block)
     if title = args[:title]
       content_for(:title, strip_tags(title))
     end
 
     content_for :page_header do
       content_tag :div, class: 'page-header' do
-        content_tag :h1 do
-          ("#{title} #{content_tag(:small, args[:desc])}").html_safe
+        res = content_tag :h1 do
+          ("#{title} #{content_tag(:small, args[:desc]) if args[:desc]}").html_safe
         end
+        res << capture(&block) if block_given?
+
+        res
       end
     end
   end

data/app/helpers/concepts_helper.rb

@@ -82,7 +82,7 @@ module ConceptsHelper
     concept.never_published? ? t("txt.views.versioning.delete") : t("txt.views.versioning.delete_copy")
   end
 
-  def concept_header(concept)
+  def concept_header(concept, &block)
     desc = concept.class.model_name.human
 
     if concept.expired_at
@@ -91,7 +91,7 @@ module ConceptsHelper
 
     title = concept.pref_label || concept.origin
 
-    page_header title: title.to_s, desc: desc.html_safe
+    page_header(title: title.to_s, desc: desc.html_safe, &block)
   end
 
   private
@@ -120,7 +120,7 @@ module ConceptsHelper
         render(association_class.partial_name(concept), further_options.merge(concept: concept, klass: association_class))
       end
     end
-    html = render partial: '/partials/match/panel', locals: { body: matches_html }
+    html = render partial: '/partials/match/panel', locals: { body: matches_html, klass: Match::SKOS::Base }
     if String.new(html).squish.present?
       ((hash[association_classes.first.view_section(concept)] ||= {})[association_classes.first.view_section_sort_key(concept)] ||= '') << html.html_safe
     end

data/app/helpers/link_helper.rb

@@ -1,14 +1,18 @@
 module LinkHelper
   def link_to_object(object, name, html_options = nil, &block)
-    path = case object
+    link_to name, link_for(object), html_options, &block
+  end
+
+  def link_for(object, params = {})
+    case object
     when Iqvoc::Concept.base_class
-      concept_path(id: object)
+      concept_url(object, params)
     when Iqvoc::Collection.base_class
-      collection_path(id: object)
+      collection_url(object, params)
     when Label::Base
-      label_path(id: object)
+      label_url(object, params)
+    else
+      raise 'Unsupported object type'
     end
-
-    link_to name, path, html_options, &block
   end
 end

data/app/helpers/navigation_helper.rb

@@ -26,18 +26,13 @@ module NavigationHelper
   # :items - a list of hashes to be used as second-level navigation items
   def nav_items(items)
     items.map do |item|
-      if !item.has_key?(:authorized?) || instance_eval(&item[:authorized?])
+      if nav_item_authorized?(item)
         if item[:items]
           content_tag :li, class: 'nav-item dropdown' do
-            raw(link_to(element_value(item[:text]).html_safe +
-                    content_tag(:i), '#',
-                    class: 'nav-link dropdown-toggle',
-                    role: 'button',
-                    'aria-haspopup': true,
-                    'aria-expanded': false,
-                    data: { toggle: 'dropdown' }) +
+            raw(nav_link(item, has_children: true) +
                 content_tag(:div,
-                    item[:items].map { |i| dropdown_nav_item(i) }.join.html_safe,
+                    item[:items].select { |i| nav_item_authorized?(i) }
+                                .map { |i| nav_link(i, class: 'dropdown-item') }.join.html_safe,
                     class: 'dropdown-menu'))
           end
         else
@@ -90,14 +85,30 @@ module NavigationHelper
     active = item[:active?] ? instance_eval(&item[:active?]) : (item[:controller] ? params[:controller] == item[:controller] : false)
     css = 'nav-item'
     css << ' active' if active
-    content_tag :li, link_to(element_value(item[:text]), element_value(item[:href]), class: 'nav-link'), class: css
+    content_tag :li, class: css do
+      nav_link(item)
+    end
   end
 
-  def dropdown_nav_item(item)
+  def nav_link(item, opts = {})
     active = item[:active?] ? instance_eval(&item[:active?]) : (item[:controller] ? params[:controller] == item[:controller] : false)
-    css = 'dropdown-item'
+
+    css = opts[:class] || 'nav-link'
     css << ' active' if active
-    link_to(element_value(item[:text]), element_value(item[:href]), class: css)
+    css << ' dropdown-toggle' if opts[:has_children]
+
+    link_opts = {
+      class: css
+    }
+
+    dropdown_opts = {
+      role: 'button',
+      'aria-haspopup': true,
+      'aria-expanded': false
+    }
+    link_opts.merge!(dropdown_opts) if opts[:has_children]
+
+    link_to(element_value(item[:text]), element_value(item[:href] || '#'), link_opts)
   end
 
   def nav_item_authorized?(item)

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