iqvoc 4.1.0 → 4.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -0
- data/Gemfile +3 -3
- data/Gemfile.lock +7 -5
- data/LICENSE +1 -1
- data/README.md +1 -1
- data/Rakefile +1 -1
- data/app/controllers/application_controller.rb +1 -1
- data/app/controllers/collections_controller.rb +1 -1
- data/app/controllers/concepts/alphabetical_controller.rb +1 -1
- data/app/controllers/concepts/expired_controller.rb +1 -1
- data/app/controllers/concepts/hierarchical_controller.rb +3 -14
- data/app/controllers/concepts/scheme_controller.rb +1 -1
- data/app/controllers/concepts/untranslated_controller.rb +1 -1
- data/app/controllers/concepts/versions_controller.rb +1 -1
- data/app/controllers/concepts_controller.rb +1 -1
- data/app/controllers/dashboard_controller.rb +1 -1
- data/app/controllers/frontpage_controller.rb +1 -1
- data/app/controllers/hierarchy_controller.rb +3 -3
- data/app/controllers/import_controller.rb +1 -1
- data/app/controllers/instance_configuration_controller.rb +1 -1
- data/app/controllers/pages_controller.rb +1 -1
- data/app/controllers/rdf_controller.rb +1 -1
- data/app/controllers/search_results_controller.rb +1 -1
- data/app/controllers/triplestore_sync_controller.rb +1 -1
- data/app/controllers/user_sessions_controller.rb +1 -1
- data/app/controllers/users_controller.rb +1 -1
- data/app/helpers/application_helper.rb +1 -1
- data/app/helpers/concepts_helper.rb +2 -3
- data/app/helpers/dashboard_helper.rb +1 -1
- data/app/helpers/rdf_helper.rb +3 -3
- data/app/helpers/search_results_helper.rb +1 -1
- data/app/models/collection/base.rb +1 -1
- data/app/models/collection/member/base.rb +1 -1
- data/app/models/collection/skos/unordered.rb +1 -1
- data/app/models/collection/unordered.rb +1 -1
- data/app/models/concept/base.rb +1 -1
- data/app/models/concept/relation/base.rb +1 -1
- data/app/models/concept/relation/reverse_relation_extension.rb +1 -1
- data/app/models/concept/relation/skos/base.rb +8 -5
- data/app/models/concept/relation/skos/broader/base.rb +1 -1
- data/app/models/concept/relation/skos/broader/mono.rb +1 -1
- data/app/models/concept/relation/skos/broader/poly.rb +1 -1
- data/app/models/concept/relation/skos/narrower/base.rb +1 -1
- data/app/models/concept/relation/skos/related.rb +1 -1
- data/app/models/concept/skos/base.rb +1 -1
- data/app/models/concept/skos/scheme.rb +1 -1
- data/app/models/configuration_setting.rb +1 -1
- data/app/models/label/base.rb +1 -1
- data/app/models/label/skos/base.rb +1 -1
- data/app/models/labeling/base.rb +1 -1
- data/app/models/labeling/skos/alt_label.rb +1 -1
- data/app/models/labeling/skos/base.rb +1 -1
- data/app/models/labeling/skos/hidden_label.rb +1 -1
- data/app/models/labeling/skos/pref_label.rb +1 -1
- data/app/models/match/base.rb +1 -1
- data/app/models/match/skos/base.rb +1 -1
- data/app/models/match/skos/broad_match.rb +1 -1
- data/app/models/match/skos/close_match.rb +1 -1
- data/app/models/match/skos/exact_match.rb +1 -1
- data/app/models/match/skos/mapping_relation.rb +1 -1
- data/app/models/match/skos/narrow_match.rb +1 -1
- data/app/models/match/skos/related_match.rb +1 -1
- data/app/models/notation/base.rb +1 -1
- data/app/models/note/annotated/base.rb +1 -1
- data/app/models/note/base.rb +1 -1
- data/app/models/note/rdfs/see_also.rb +20 -0
- data/app/models/note/skos/base.rb +14 -13
- data/app/models/note/skos/change_note.rb +1 -1
- data/app/models/note/skos/definition.rb +1 -1
- data/app/models/note/skos/editorial_note.rb +1 -1
- data/app/models/note/skos/example.rb +1 -1
- data/app/models/note/skos/history_note.rb +1 -1
- data/app/models/note/skos/scope_note.rb +1 -1
- data/app/models/search_extension.rb +1 -1
- data/app/models/user.rb +1 -1
- data/app/models/user_session.rb +1 -1
- data/app/views/concepts/hierarchical/_treeview.html.erb +8 -10
- data/app/views/concepts/hierarchical/index.json.jbuilder +15 -0
- data/app/views/concepts/index.iqrdf +1 -1
- data/config/application.rb +1 -1
- data/config/boot.rb +1 -1
- data/config/environment.rb +1 -1
- data/config/environments/development.rb +1 -1
- data/config/environments/heroku.rb +1 -1
- data/config/environments/production.rb +1 -1
- data/config/environments/test.rb +1 -1
- data/config/initializers/action_view.rb +1 -1
- data/config/initializers/active_record.rb +1 -1
- data/config/initializers/backtrace_silencers.rb +1 -1
- data/config/initializers/heroku.rb +1 -1
- data/config/initializers/inflections.rb +1 -1
- data/config/initializers/iqvoc.rb +1 -1
- data/config/initializers/jdbc.rb +1 -1
- data/config/initializers/mime_types.rb +1 -1
- data/config/initializers/secret_token.rb.template +1 -1
- data/config/initializers/secret_token_configurator.rb +1 -1
- data/config/initializers/session_store.rb +1 -1
- data/config/locales/activerecord.de.yml +1 -1
- data/config/locales/activerecord.en.yml +1 -1
- data/config/locales/activerecord.pt.yml +1 -1
- data/config/locales/authlogic.de.yml +1 -1
- data/config/locales/authlogic.en.yml +1 -1
- data/config/locales/authlogic.pt.yml +1 -1
- data/config/locales/de.yml +12 -12
- data/config/locales/defaults.de.yml +1 -1
- data/config/locales/en.yml +11 -11
- data/config/locales/pt.yml +1 -1
- data/config/routes.rb +2 -2
- data/config/warble.rb +1 -1
- data/db/migrate/20100927101502_create_schema.rb +1 -1
- data/db/migrate/20101125141218_add_collection_tables.rb +1 -1
- data/db/migrate/20101129161528_add_type_to_collections.rb +1 -1
- data/db/migrate/20101202094602_add_origin_to_collections.rb +1 -1
- data/db/migrate/20101202135420_rename_collection_contents_to_collection_members.rb +1 -1
- data/db/migrate/20101208103531_add_type_to_collection_contents.rb +1 -1
- data/db/migrate/20101210153916_add_indexes_to_collections.rb +1 -1
- data/db/migrate/20110204121244_create_collection_labels.rb +1 -1
- data/db/migrate/20110208084250_change_origin_lengths.rb +1 -1
- data/db/migrate/20110328124300_discard_collection_specifics.rb +1 -1
- data/db/migrate/20130418093837_add_language_to_note_annotations.rb +5 -0
- data/db/schema.rb +2 -1
- data/db/seeds.rb +1 -1
- data/iqvoc.gemspec +1 -0
- data/lib/iqvoc.rb +1 -1
- data/lib/iqvoc/configuration/core.rb +2 -2
- data/lib/iqvoc/deep_cloning.rb +1 -1
- data/lib/iqvoc/inline_data_helper.rb +1 -1
- data/lib/iqvoc/instance_configuration.rb +7 -6
- data/lib/iqvoc/origin.rb +1 -1
- data/lib/iqvoc/rdfapi.rb +3 -1
- data/lib/iqvoc/version.rb +2 -2
- data/lib/iqvoc/versioning.rb +1 -1
- data/lib/string.rb +1 -1
- data/test/factories.rb +1 -1
- data/test/functional/hierarchy_test.rb +1 -2
- data/test/functional/rdf_test.rb +98 -0
- data/test/integration/alphabetical_test.rb +1 -1
- data/test/integration/authentication_test.rb +1 -1
- data/test/integration/browse_concepts_and_labels_test.rb +1 -1
- data/test/integration/client_augmentation_test.rb +1 -1
- data/test/integration/client_edit_concept_test.rb +1 -1
- data/test/integration/collection_circularity_test.rb +1 -1
- data/test/integration/concept_scheme_test.rb +1 -1
- data/test/integration/concept_test.rb +1 -1
- data/test/integration/edit_concepts_test.rb +1 -1
- data/test/integration/instance_configuration_test.rb +1 -1
- data/test/integration/note_annotations_test.rb +27 -1
- data/test/integration/search_test.rb +1 -1
- data/test/integration/tree_test.rb +1 -1
- data/test/integration/untranslated_test.rb +1 -1
- data/test/integration_test_helper.rb +1 -1
- data/test/performance/browsing_test.rb +1 -1
- data/test/test_helper.rb +6 -12
- data/test/unit/concept_scheme_test.rb +1 -1
- data/test/unit/concept_test.rb +1 -1
- data/test/unit/hygiene_test.rb +2 -2
- data/test/unit/inline_data_test.rb +1 -1
- data/test/unit/instance_configuration_test.rb +1 -1
- data/test/unit/note_test.rb +1 -1
- data/test/unit/origin_test.rb +1 -1
- data/test/unit/rdf_sync_test.rb +1 -1
- data/test/unit/skos_import_test.rb +1 -1
- metadata +21 -2
data/app/models/user_session.rb
CHANGED
|
@@ -1,20 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
:published => params[:published], :broader => broader || nil) -%>
|
|
1
|
+
<% hcpath = hierarchical_concepts_path(:format => :json, :published => params[:published], :broader => broader || nil) %>
|
|
3
2
|
<ul class="hybrid-treeview" data-url="<%= hcpath %>">
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
<%- has_children = broader ? concept.broader_relations.any? : concept.narrower_relations.any? -%>
|
|
3
|
+
<% concepts.select { |c| can? :read, c }.each do |concept| %>
|
|
4
|
+
<% has_children = broader ? concept.broader_relations.any? : concept.narrower_relations.any? %>
|
|
7
5
|
|
|
8
6
|
<li class="<%= has_children ? "hasChildren" : "" %>" id="<%= concept.id %>">
|
|
9
7
|
<%= link_to(concept.pref_label.to_s, concept_url(:id => concept)) %>
|
|
10
|
-
|
|
8
|
+
<% if concept.additional_info.present? %>
|
|
11
9
|
(<%= concept.additional_info %>)
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
<% end %>
|
|
11
|
+
<% if has_children %>
|
|
14
12
|
<ul>
|
|
15
13
|
<li><span class="placeholder"> </span></li>
|
|
16
14
|
</ul>
|
|
17
|
-
|
|
15
|
+
<% end %>
|
|
18
16
|
</li>
|
|
19
|
-
|
|
17
|
+
<% end %>
|
|
20
18
|
</ul>
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
json.array! @concepts.select { |c| can? :read, c } do |concept|
|
|
2
|
+
json.id concept.id
|
|
3
|
+
json.url concept_path(:id => concept, :format => :html)
|
|
4
|
+
json.text CGI.escapeHTML(concept.pref_label.to_s)
|
|
5
|
+
|
|
6
|
+
if params[:broader]
|
|
7
|
+
json.hasChildren concept.broader_relations.any?
|
|
8
|
+
else
|
|
9
|
+
json.hasChildren concept.narrower_relations.any?
|
|
10
|
+
end
|
|
11
|
+
|
|
12
|
+
if concept.additional_info.present?
|
|
13
|
+
json.additionalText " (#{concept.additional_info})"
|
|
14
|
+
end
|
|
15
|
+
end
|
|
@@ -20,7 +20,7 @@ while true
|
|
|
20
20
|
{:relations => :target, :labelings => :target, :notes => :annotations}]).run
|
|
21
21
|
|
|
22
22
|
concepts.each do |concept|
|
|
23
|
-
render_concept(document, concept)
|
|
23
|
+
render_concept(document, concept, true)
|
|
24
24
|
end
|
|
25
25
|
|
|
26
26
|
offset+= concepts.size # Size is important!
|
data/config/application.rb
CHANGED
data/config/boot.rb
CHANGED
data/config/environment.rb
CHANGED
data/config/environments/test.rb
CHANGED
data/config/initializers/jdbc.rb
CHANGED
data/config/locales/de.yml
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
## encoding: UTF-8
|
|
2
2
|
|
|
3
|
-
# Copyright 2011 innoQ Deutschland GmbH
|
|
3
|
+
# Copyright 2011-2013 innoQ Deutschland GmbH
|
|
4
4
|
#
|
|
5
5
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
6
|
# you may not use this file except in compliance with the License.
|
|
@@ -284,23 +284,23 @@ de:
|
|
|
284
284
|
login_success: "Anmeldung erfolgreich."
|
|
285
285
|
logout_success: "Abmeldung erfolgreich."
|
|
286
286
|
versioning:
|
|
287
|
-
branch_error: "Es existiert schon eine neue Version
|
|
287
|
+
branch_error: "Es existiert schon eine neue Version."
|
|
288
288
|
published: "Instanz wurde erfolgreich veröffentlicht."
|
|
289
|
-
published_with_warning: "Instanz wurde erfolgreich veröffentlicht, hat aber keine Relationen zu anderen Instanzen
|
|
290
|
-
merged_delete_error: "Das alte Label konnte nicht gelöscht werden
|
|
291
|
-
merged_publishing_error: "Instanz konnte nicht veröffentlicht werden
|
|
289
|
+
published_with_warning: "Instanz wurde erfolgreich veröffentlicht, hat aber keine Relationen zu anderen Instanzen."
|
|
290
|
+
merged_delete_error: "Das alte Label konnte nicht gelöscht werden."
|
|
291
|
+
merged_publishing_error: "Instanz konnte nicht veröffentlicht werden - bitte führen Sie eine Konsistenzprüfung durch."
|
|
292
292
|
branched: "Instanzkopie wurde erfolgreich angelegt und für andere Benutzer gesperrt."
|
|
293
293
|
locked: "Instanz wurde für andere User gesperrt."
|
|
294
|
-
lock_error: "Instanz ist bereits gesperrt
|
|
294
|
+
lock_error: "Instanz ist bereits gesperrt."
|
|
295
295
|
unlocked: "Instanz wurde für andere User entsperrt."
|
|
296
|
-
unlock_error: "Instanz ist bereits entsperrt
|
|
297
|
-
new_version_blank_error: "Es existiert noch keine neue Version
|
|
296
|
+
unlock_error: "Instanz ist bereits entsperrt."
|
|
297
|
+
new_version_blank_error: "Es existiert noch keine neue Version."
|
|
298
298
|
delete: "Instanz löschen."
|
|
299
299
|
consistency_check_success: "Instanz ist konsistent."
|
|
300
|
-
consistency_check_success_with_warning: "Instanz ist konsistent
|
|
301
|
-
consistency_check_error: "Instanz ist inkonsistent
|
|
302
|
-
to_review_success: "Wurde in den Freigabeprozess aufgenommen"
|
|
303
|
-
to_review_error: "Konnte nicht in den Freigabeprozess aufgenommen werden"
|
|
300
|
+
consistency_check_success_with_warning: "Instanz ist konsistent, hat aber keine Relationen zu anderen Instanzen."
|
|
301
|
+
consistency_check_error: "Instanz ist inkonsistent."
|
|
302
|
+
to_review_success: "Wurde in den Freigabeprozess aufgenommen."
|
|
303
|
+
to_review_error: "Konnte nicht in den Freigabeprozess aufgenommen werden."
|
|
304
304
|
labelings:
|
|
305
305
|
save:
|
|
306
306
|
success: "Das Labeling wurde erfolgreich gespeichert."
|
data/config/locales/en.yml
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# encoding: UTF-8
|
|
2
2
|
|
|
3
|
-
# Copyright 2011 innoQ Deutschland GmbH
|
|
3
|
+
# Copyright 2011-2013 innoQ Deutschland GmbH
|
|
4
4
|
#
|
|
5
5
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
6
|
# you may not use this file except in compliance with the License.
|
|
@@ -291,19 +291,19 @@ en:
|
|
|
291
291
|
login_success: "Login successful."
|
|
292
292
|
logout_success: "Logout successful."
|
|
293
293
|
versioning:
|
|
294
|
-
branch_error: "A new version already exists
|
|
295
|
-
published: "Instance has been successfully
|
|
296
|
-
published_with_warning: "Instance has been successfully
|
|
297
|
-
merged_delete_error: "Label could not be deleted
|
|
298
|
-
merged_publishing_error: "Instance could not be
|
|
294
|
+
branch_error: "A new version already exists."
|
|
295
|
+
published: "Instance has been successfully published."
|
|
296
|
+
published_with_warning: "Instance has been successfully published, but it has no relations!"
|
|
297
|
+
merged_delete_error: "Label could not be deleted."
|
|
298
|
+
merged_publishing_error: "Instance could not be published - please consult the consistency check."
|
|
299
299
|
branched: "Instance copy has been created and locked."
|
|
300
300
|
locked: "Instance has been locked."
|
|
301
|
-
lock_error: "Instance
|
|
301
|
+
lock_error: "Instance is already locked."
|
|
302
302
|
unlocked: "Instance has been unlocked."
|
|
303
|
-
unlock_error: "Instance has been unlocked
|
|
304
|
-
to_review_success: "
|
|
305
|
-
to_review_error: "
|
|
306
|
-
new_version_blank_error: "A new version does not exist
|
|
303
|
+
unlock_error: "Instance has been alraedy unlocked."
|
|
304
|
+
to_review_success: "Sent to review."
|
|
305
|
+
to_review_error: "Can't send to review."
|
|
306
|
+
new_version_blank_error: "A new version does not yet exist!"
|
|
307
307
|
delete: "Delete instance."
|
|
308
308
|
consistency_check_success: "Instance is consistent."
|
|
309
309
|
consistency_check_success_with_warning: "Instance is consistent but has no relations."
|
data/config/locales/pt.yml
CHANGED
data/config/routes.rb
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# encoding: UTF-8
|
|
2
2
|
|
|
3
|
-
# Copyright 2011 innoQ Deutschland GmbH
|
|
3
|
+
# Copyright 2011-2013 innoQ Deutschland GmbH
|
|
4
4
|
#
|
|
5
5
|
# Licensed under the Apache License, Version 2.0 (the 'License');
|
|
6
6
|
# you may not use this file except in compliance with the License.
|
|
@@ -41,7 +41,7 @@ Rails.application.routes.draw do
|
|
|
41
41
|
post 'concepts/:origin/lock' => 'concepts/versions#lock', :as => 'concept_versions_lock'
|
|
42
42
|
post 'concepts/:origin/unlock' => 'concepts/versions#unlock', :as => 'concept_versions_unlock'
|
|
43
43
|
post 'concepts/:origin/to_review' => 'concepts/versions#to_review', :as => 'concept_versions_to_review'
|
|
44
|
-
|
|
44
|
+
get 'concepts/:origin/consistency_check' => 'concepts/versions#consistency_check', :as => 'concept_versions_consistency_check'
|
|
45
45
|
|
|
46
46
|
get 'alphabetical_concepts(/:prefix)' => 'concepts/alphabetical#index', :as => 'alphabetical_concepts'
|
|
47
47
|
get 'untranslated_concepts/:prefix' => 'concepts/untranslated#index', :as => 'untranslated_concepts'
|
data/config/warble.rb
CHANGED