iqvoc_skosxl 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f14622bd5b6659d1a10c80eaaf7aa726c9949ff
-  data.tar.gz: 4322450f8ac9646e001bc4ae296daf1e03c561bc
+  metadata.gz: 30a0db365c1f573222b93a3963683ca8331a05b4
+  data.tar.gz: d3fc2c276bf9e31adb3f82ccf7804db9a3d361eb
 SHA512:
-  metadata.gz: 0c3f60e5c7ab2eea9f0c2b8b78c1041ad5d8c8f6c5d4f01621ac5c89169c56e278efa3e33d6c4063d5c90141843930a13c1e376ed288f115626fe0ddae3441d3
-  data.tar.gz: f9f04483cfe7df69c2891d96cc557ade4a11dda2e4321bfec1057d9c3796b0028b5adc85ad5650d02b4fec48ab4f215c38c80fda796012830476a4c91ec76958
+  metadata.gz: a26f186fb956734a1a6a1242656bd7d79d4ceae86a00491d0c4276ed57ff10e1c3cd308ed27c89a8d5f1093c7f43f136be2462b490638bb523d5033b6a1a44ac
+  data.tar.gz: 6c1979e28285db24712fdca025645629cc38f218a969a2e9f374e831ff0579f35d4f6e6646d2369ae8fb06a97e0806064fc07a3314894e84a7f7c277ab9d827a

data/Gemfile

@@ -1,20 +1,22 @@
 source 'https://rubygems.org'
 
-gem 'iqvoc', '~> 4.8.0', :github => 'innoq/iqvoc'
+gem 'iqvoc', '~> 4.9.0', :github => 'innoq/iqvoc', branch: 'master'
+
+platforms :ruby do
+  gem 'mysql2'
+  gem 'sqlite3'
+  gem 'pg'
+end
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcmysql-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.13'
+end
 
 group :development, :test do
   gem 'awesome_print'
-  gem 'spring'
   gem 'pry-rails'
-
-  platforms :ruby do
-    gem 'mysql2'
-    gem 'sqlite3'
-  end
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
-    gem 'activerecord-jdbcmysql-adapter'
-  end
 end
 
 group :test do

data/Gemfile.lock

@@ -1,10 +1,12 @@
 GIT
   remote: git://github.com/innoq/iqvoc.git
-  revision: 2c318aa4315dd44af73797b8a05eb0c20b82ac5d
+  revision: 866b343dc8d2b913dbfa40887137c4a89005dd32
+  branch: master
   specs:
-    iqvoc (4.8.2)
+    iqvoc (4.9.0)
       apipie-rails
       authlogic (~> 3.4.2)
+      autoprefixer-rails (~> 5.1.8)
       bootstrap-sass (~> 3.3.1.0)
       bootstrap_form (~> 2.2.0)
       bundler
@@ -12,7 +14,7 @@ GIT
       carrierwave
       database_cleaner
       delayed_job_active_record (~> 4.0.1)
-      faraday
+      faraday (= 0.9.0)
       faraday_middleware
       font-awesome-rails (~> 4.2.0)
       iq_rdf (>= 0.1.15)
@@ -31,64 +33,73 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0)
-      activesupport (= 4.2.0)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0)
-      activesupport (= 4.2.0)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
       arel (~> 6.0)
-    activerecord-jdbc-adapter (1.3.7)
+    activerecord-jdbc-adapter (1.3.14)
       activerecord (>= 2.2)
-    activerecord-jdbcmysql-adapter (1.3.7)
-      activerecord-jdbc-adapter (~> 1.3.7)
+    activerecord-jdbcmysql-adapter (1.3.14)
+      activerecord-jdbc-adapter (~> 1.3.14)
       jdbc-mysql (>= 5.1.22)
-    activerecord-jdbcsqlite3-adapter (1.3.7)
-      activerecord-jdbc-adapter (~> 1.3.7)
-      jdbc-sqlite3 (~> 3.7.2)
-    activesupport (4.2.0)
+    activerecord-jdbcpostgresql-adapter (1.3.14)
+      activerecord-jdbc-adapter (~> 1.3.14)
+      jdbc-postgres (>= 9.1)
+    activerecord-jdbcsqlite3-adapter (1.3.14)
+      activerecord-jdbc-adapter (~> 1.3.14)
+      jdbc-sqlite3 (>= 3.7.2, < 3.9)
+    activesupport (4.2.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    apipie-rails (0.3.1)
+    addressable (2.3.8)
+    apipie-rails (0.3.4)
       json
     arel (6.0.0)
-    authlogic (3.4.4)
+    authlogic (3.4.5)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       request_store (~> 1.0)
       scrypt (~> 1.2)
-    awesome_print (1.2.0)
+    autoprefixer-rails (5.1.11)
+      execjs
+      json
+    awesome_print (1.6.1)
+    bcp47 (0.3.3)
+      i18n
     bootstrap-sass (3.3.1.0)
       sass (~> 3.2)
     bootstrap_form (2.2.0)
     builder (3.2.2)
     cancancan (1.10.1)
-    capybara (2.3.0)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -101,36 +112,34 @@ GEM
       mime-types (>= 1.16)
     cliver (0.3.2)
     coderay (1.1.0)
-    database_cleaner (1.4.0)
+    database_cleaner (1.4.1)
     delayed_job (4.0.6)
       activesupport (>= 3.0, < 5.0)
     delayed_job_active_record (4.0.3)
       activerecord (>= 3.0, < 5.0)
       delayed_job (>= 3.0, < 4.1)
-    ebnf (0.3.6)
-      haml (~> 4.0)
+    ebnf (0.3.9)
       rdf (~> 1.1)
       sxp (~> 0.1, >= 0.1.3)
-    equivalent-xml (0.5.1)
+    equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     erubis (2.7.0)
-    execjs (2.2.2)
-    faraday (0.9.1)
+    execjs (2.5.2)
+    faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.6)
-    ffi (1.9.6-java)
+    ffi (1.9.8)
+    ffi (1.9.8-java)
     ffi-compiler (0.1.3)
       ffi (>= 1.0.0)
       rake
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
-    globalid (0.3.0)
+    globalid (0.3.5)
       activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt
-    hike (1.2.3)
     htmlentities (4.3.3)
     i18n (0.7.0)
     iq_rdf (0.1.15)
@@ -138,121 +147,126 @@ GEM
       builder
       bundler
     iq_triplestorage (0.2.2)
-    jdbc-mysql (5.1.30)
-    jdbc-sqlite3 (3.7.2.1)
+    jdbc-mysql (5.1.33)
+    jdbc-postgres (9.3.1102)
+    jdbc-sqlite3 (3.8.7)
     json (1.8.2)
     json (1.8.2-java)
-    json-ld (1.1.7)
-      rdf (~> 1.1, >= 1.1.4)
-    kaminari (0.16.2)
+    json-ld (1.1.8)
+      rdf (~> 1.1, >= 1.1.7)
+    kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kaminari-bootstrap (3.0.1)
       kaminari (>= 0.13.0)
       rails
     link_header (0.0.8)
-    linkeddata (1.1.2)
-      equivalent-xml (~> 0.4)
-      json-ld (~> 1.1, >= 1.1.7)
+    linkeddata (1.1.11)
+      equivalent-xml (~> 0.5)
+      json-ld (~> 1.1, >= 1.1.8)
       nokogiri (~> 1.6)
-      rdf (~> 1.1, >= 1.1.7)
+      rdf (~> 1.1, >= 1.1.11)
       rdf-aggregate-repo (~> 1.1)
       rdf-isomorphic (~> 1.1)
-      rdf-json (~> 1.1)
-      rdf-microdata (~> 2.0)
-      rdf-n3 (~> 1.1)
-      rdf-rdfa (~> 1.1, >= 1.1.5)
-      rdf-rdfxml (~> 1.1, >= 1.1.3)
+      rdf-json (~> 1.1, >= 1.1.2)
+      rdf-microdata (~> 2.0, >= 2.0.1)
+      rdf-n3 (~> 1.1, >= 1.1.3)
+      rdf-rdfa (~> 1.1, >= 1.1.6)
+      rdf-rdfxml (~> 1.1, >= 1.1.4)
       rdf-reasoner (~> 0.2, >= 0.2.1)
-      rdf-trig (~> 1.1, >= 1.1.3)
+      rdf-tabular (~> 0.1, >= 0.1.2)
+      rdf-trig (~> 1.1, >= 1.1.4)
       rdf-trix (~> 1.1)
-      rdf-turtle (~> 1.1, >= 1.1.5)
-      sparql (~> 1.1, >= 1.1.4)
+      rdf-turtle (~> 1.1, >= 1.1.6)
+      rdf-vocab (~> 0.8)
+      rdf-xsd (~> 1.1, >= 1.1.3)
+      sparql (~> 1.1, >= 1.1.5)
       sparql-client (~> 1.1, >= 1.1.3)
-    loofah (2.0.1)
+    loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     maruku (0.7.2)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.5)
     mini_portile (0.6.2)
-    minitest (5.5.1)
-    multi_json (1.10.1)
+    minitest (5.6.1)
+    multi_json (1.11.0)
     multipart-post (2.0.0)
-    mysql2 (0.3.16)
+    mysql2 (0.3.17)
     net-http-persistent (2.9.4)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     nokogiri (1.6.6.2-java)
+    pg (0.18.1)
     poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry (0.9.12.6-java)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
       spoon (~> 0.0)
-    pry-rails (0.3.2)
+    pry-rails (0.3.3)
       pry (>= 0.9.10)
-    rack (1.6.0)
+    rack (1.6.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.0)
-      actionmailer (= 4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
-      activemodel (= 4.2.0)
-      activerecord (= 4.2.0)
-      activesupport (= 4.2.0)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0)
+      railties (= 4.2.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.6)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rdf (1.1.7)
+    rdf (1.1.13)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (1.1.0)
       rdf (>= 1.1)
     rdf-isomorphic (1.1.0)
       rdf (>= 1.1)
-    rdf-json (1.1.1)
+    rdf-json (1.1.2)
       rdf (~> 1.1)
-    rdf-microdata (2.0)
+    rdf-microdata (2.0.1)
       htmlentities (~> 4.3)
       nokogiri (~> 1.6)
       rdf (~> 1.1)
       rdf-xsd (~> 1.1)
-    rdf-n3 (1.1.2)
+    rdf-n3 (1.1.3)
       rdf (~> 1.1, >= 1.1.5)
-    rdf-rdfa (1.1.5)
+    rdf-rdfa (1.1.6)
       haml (~> 4.0)
       htmlentities (~> 4.3)
       rdf (~> 1.1, >= 1.1.6)
-      rdf-aggregate-repo
+      rdf-aggregate-repo (~> 1.1)
       rdf-xsd (~> 1.1)
-    rdf-rdfxml (1.1.3)
+    rdf-rdfxml (1.1.4)
       htmlentities (~> 4.3)
       rdf (~> 1.1, >= 1.1.6)
       rdf-rdfa (~> 1.1, >= 1.1.4.1)
@@ -261,20 +275,28 @@ GEM
       rdf (~> 1.1, >= 1.1.4.2)
       rdf-turtle (~> 1.1)
       rdf-xsd (~> 1.1)
-    rdf-trig (1.1.3.1)
-      ebnf (~> 0.3, >= 0.3.5)
-      rdf (~> 1.1, >= 1.1.2.1)
-      rdf-turtle (~> 1.1, >= 1.1.3)
+    rdf-tabular (0.1.3.1)
+      addressable (~> 2.3)
+      bcp47 (~> 0.3, >= 0.3.3)
+      json-ld (~> 1.1)
+      rdf (~> 1.1, >= 1.1.7)
+      rdf-xsd (~> 1.1)
+    rdf-trig (1.1.4)
+      ebnf (~> 0.3, >= 0.3.7)
+      rdf (~> 1.1, >= 1.1.11)
+      rdf-turtle (~> 1.1, >= 1.1.6)
     rdf-trix (1.1.0)
       rdf (>= 1.1)
-    rdf-turtle (1.1.5)
+    rdf-turtle (1.1.6)
       ebnf (~> 0.3, >= 0.3.6)
-      rdf (~> 1.1, >= 1.1.4)
-    rdf-xsd (1.1.2)
-      rdf (~> 1.1)
+      rdf (~> 1.1, >= 1.1.10)
+    rdf-vocab (0.8.2)
+      rdf (~> 1.1, >= 1.1.10)
+    rdf-xsd (1.1.3)
+      rdf (~> 1.1, >= 1.1.9)
     request_store (1.1.0)
-    sass (3.4.10)
-    sass-rails (5.0.1)
+    sass (3.4.13)
+    sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -283,43 +305,42 @@ GEM
     scrypt (1.2.1)
       ffi-compiler (>= 0.0.2)
       rake
-    slop (3.5.0)
-    sparql (1.1.4)
-      builder (~> 3.0)
-      ebnf (~> 0.3, >= 0.3.5)
-      rdf (~> 1.1, >= 1.1.4)
+    slop (3.6.0)
+    sparql (1.1.7)
+      builder (~> 3.2)
+      ebnf (~> 0.3, >= 0.3.9)
+      rdf (~> 1.1, >= 1.1.13)
       rdf-aggregate-repo (~> 1.1, >= 1.1.0)
       rdf-xsd (~> 1.1)
       sparql-client (~> 1.1)
       sxp (~> 0.1)
-    sparql-client (1.1.3.1)
+    sparql-client (1.1.5)
       net-http-persistent (~> 2.9)
       rdf (~> 1.1)
     spoon (0.0.4)
       ffi
-    spring (1.1.3)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.1.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.9)
+    sqlite3 (1.3.10)
     sxp (0.1.5)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    thread_safe (0.3.4-java)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.0)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    websocket-driver (0.3.3)
-    websocket-driver (0.3.3-java)
+    websocket-driver (0.5.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-driver (0.5.1-java)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -329,12 +350,16 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcmysql-adapter
+  activerecord-jdbcpostgresql-adapter (~> 1.3.13)
   activerecord-jdbcsqlite3-adapter
   awesome_print
   capybara
-  iqvoc (~> 4.8.0)!
+  iqvoc (~> 4.9.0)!
   mysql2
+  pg
   poltergeist (~> 1.5.0)
   pry-rails
-  spring
   sqlite3
+
+BUNDLED WITH
+   1.10.6

data/app/assets/stylesheets/manifest.css.scss

@@ -1,3 +1,4 @@
+@import 'iqvoc/settings/bootstrap-variables';
 @import 'framework';
 @import 'iqvoc/manifest';
 @import 'iqvoc_skosxl/manifest';

data/app/controllers/labels/versions_controller.rb

@@ -47,6 +47,14 @@ class Labels::VersionsController < ApplicationController
     ActiveRecord::Base.transaction do
       new_version = current_label.branch(current_user)
       new_version.save!
+      Iqvoc.change_note_class.create! do |note|
+        note.owner = new_version
+        note.language = I18n.locale.to_s
+        note.annotations_attributes = [
+          { namespace: 'dct', predicate: 'creator', value: current_user.name },
+          { namespace: 'dct', predicate: 'modified', value: DateTime.now.to_s }
+        ]
+      end
     end
     flash[:success] = t('txt.controllers.versioning.branched')
     redirect_to edit_label_path(published: 0, id: new_version, check_associations_in_editing_mode: true)

data/app/controllers/labels_controller.rb

@@ -16,7 +16,7 @@ class LabelsController < ApplicationController
       end
       format.text do
         render content_type: 'text/plain',
-            text: @labels.map { |label| "#{label.origin}: #{label.value}" }.join("\n")
+          text: @labels.map { |label| "#{label.origin}: #{label.value}" }.join("\n")
       end
       format.json do
         response = []
@@ -28,20 +28,23 @@ class LabelsController < ApplicationController
   end
 
   def show
-    if params[:published] == '1' || !params[:published]
-      published = true
-      @label = Iqvoc::XLLabel.base_class.by_origin(params[:id]).published.last
+    scope = Iqvoc::XLLabel.base_class.by_origin(params[:id]).with_associations
+
+    @published = params[:published] == '1' || !params[:published]
+    if @published
+      scope = scope.published
       @new_label_version = Iqvoc::XLLabel.base_class.by_origin(params[:id]).unpublished.last
-    elsif params[:published] == '0'
-      published = false
-      @label = Iqvoc::XLLabel.base_class.by_origin(params[:id]).unpublished.last!
+    else
+      scope = scope.unpublished
     end
 
+    @label = scope.last!
+
     authorize! :read, @label
 
     respond_to do |format|
       format.html do
-        published ? render('show_published') : render('show_unpublished')
+        @published ? render('show_published') : render('show_unpublished')
       end
       format.ttl
     end
@@ -49,10 +52,7 @@ class LabelsController < ApplicationController
 
   def new
     authorize! :create, Iqvoc::XLLabel.base_class
-    raise 'You have to specify a language parameter!' if params[:language].blank?
-    data = {language: params[:language]}
-    data.merge(value: params[:value]) if params[:value]
-    @label = Iqvoc::XLLabel.base_class.new(data)
+    @label = Iqvoc::XLLabel.base_class.new
   end
 
   def create
@@ -99,6 +99,9 @@ class LabelsController < ApplicationController
     @label = Iqvoc::XLLabel.base_class.by_origin(params[:id]).unpublished.last!
     authorize! :update, @label
 
+    # set to_review to false if someone edits a label
+    label_params["to_review"] = "false"
+
     respond_to do |format|
       format.html do
         if @label.update_attributes(label_params)

data/app/models/concept/skosxl/extension.rb

@@ -37,14 +37,14 @@ module Concept
       def labelings_by_id(relation_name, language)
         (@labelings_by_id && @labelings_by_id[relation_name] && @labelings_by_id[relation_name][language]) ||
           self.send(relation_name).by_label_language(language).
-              map { |l| l.target.origin }.join(InlineDataHelper::JOINER)
+              map { |l| l.target.origin if l.target.published?}.join(InlineDataHelper::JOINER)
       end
 
       def valid_label_language
         (@labelings_by_id || {}).each { |labeling_class_name, origin_mappings|
           origin_mappings.each { |language, new_origins|
             new_origins = new_origins.split(InlineDataHelper::SPLITTER)
-            Iqvoc::XLLabel.base_class.by_origin(new_origins).each do |label|
+            Iqvoc::XLLabel.base_class.by_origin(new_origins).published.each do |label|
               if label.language != language.to_s
                 errors.add(:base,
                     I18n.t('txt.controllers.versioned_concept.label_error') % label)

data/app/models/label/skosxl/base.rb

@@ -101,18 +101,39 @@ class Label::SKOSXL::Base < Label::Base
 
   # ********** Methods
 
-  # def self.single_query(params = {})
-  #   query_str = build_query_string(params)
-  #
-  #   by_query_value(query_str).
-  #   by_language(params[:languages].to_a).
-  #   published.
-  #   order("LOWER(#{Label::Base.table_name}.value)")
-  # end
-
-  # def self.search_result_partial_name
-  #   'partials/labeling/skosxl/search_result'
-  # end
+  def self.single_query(params = {})
+    query_str = build_query_string(params)
+
+    scope = by_query_value(query_str).
+      by_language(params[:languages].to_a).includes(:concepts).references(:concepts)
+      published.
+      order("LOWER(#{Label::Base.table_name}.value)")
+
+    if params[:collection_origin].present?
+      collection = Collection::Base.where(origin: params[:collection_origin]).last
+      if collection
+        scope = scope.includes(concepts: [ collections: { collection_members: :collection } ])
+        scope = scope.where("#{Collection::Member::Base.table_name}.collection_id" => collection.id)
+      else
+        raise "Collection with Origin #{params[:collection_origin]} not found!"
+      end
+    end
+
+    # apply search entity type
+    case params[:for]
+    when 'concept'
+      scope = scope.includes(:concepts).merge(Iqvoc::Concept.base_class.published)
+    when 'collection'
+      scope = scope.includes(:concepts).merge(Iqvoc::Collection.base_class.published)
+    end
+
+    scope = yield(scope) if block_given?
+    scope.map { |result| SearchResult.new(result) }
+  end
+
+  def self.search_result_partial_name
+    'partials/label/skosxl/search_result'
+  end
 
   def self.new_link_partial_name
     'partials/label/skosxl/new_link_base'