iqvoc 4.4.0 → 4.5.0

data/app/controllers/concepts_controller.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011-2013 innoQ Deutschland GmbH
+# Copyright 2011-2014 innoQ Deutschland GmbH
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,9 +34,8 @@ class ConceptsController < ApplicationController
   end
 
   def show
-    scope = Iqvoc::Concept.base_class.
-      by_origin(params[:id]).
-      with_associations
+    scope = Iqvoc::Concept.base_class.by_origin(params[:id]).with_associations
+
     published = params[:published] == '1' || !params[:published]
     if published
       scope = scope.published
@@ -169,11 +168,77 @@ class ConceptsController < ApplicationController
     end
   end
 
+  def move
+    moved_concept = Iqvoc::Concept.base_class.find(params.require(:moved_node_id))
+
+    if moved_concept.published?
+      authorize! :branch, moved_concept
+    else
+      authorize! :update, moved_concept
+    end
+
+    new_parent_concept = Iqvoc::Concept.base_class.find(params.require(:new_parent_node_id))
+    new_parent_concept_version = concept_version(new_parent_concept)
+
+    ActiveRecord::Base.transaction do
+      moved_concept_version = concept_version(moved_concept)
+
+      if params[:tree_action] == 'move' && Iqvoc::Concept.root_class.instance.mono_hierarchy?
+        if moved_concept.top_term?
+          moved_concept_version.update_attribute(:top_term, false)
+        else
+          # removed old relations
+          old_parent_concept = Iqvoc::Concept.base_class.find(params.require(:old_parent_node_id))
+          old_parent_concept_version = concept_version(old_parent_concept)
+
+          moved_concept_version.send(Iqvoc::Concept.broader_relation_class_name.to_relation_name)
+             .destroy_with_reverse_relation(old_parent_concept_version)
+
+          # delete relations which will be created during branching
+          if old_parent_concept_version.narrower_relations.find_by(target_id: moved_concept.id)
+            old_parent_concept_version.narrower_relations.find_by(target_id: moved_concept.id).destroy!
+          end
+          if moved_concept_version.broader_relations.find_by(target_id: old_parent_concept.id)
+            moved_concept_version.broader_relations.find_by(target_id: old_parent_concept.id).destroy!
+          end
+        end
+      end
+
+      # add new relations to concept version
+      Iqvoc::Concept.broader_relation_class.create! do |r|
+        r.owner = moved_concept_version
+        r.target = new_parent_concept_version
+      end
+
+      Concept::Relation::SKOS::Narrower::Base.create! do |r|
+        r.owner = new_parent_concept_version
+        r.target = moved_concept_version
+      end
+    end
+
+    render nothing: true
+  end
+
   protected
 
-def concept_params
-  params.require(:concept).permit!
-end
+  def concept_params
+    params.require(:concept).permit!
+  end
+
+  # get concept to work with
+  # return a new version of the concept or the current draft (if exists)
+  def concept_version(concept)
+    if concept.published?
+      # create a new version
+      version = concept.branch(current_user)
+      version.save!
+    else
+      # use current draft concept
+      version = concept
+    end
+
+    version
+  end
 
   # TODO: rename to match the behavior of the method
   def labeling_as_json(labeling)

data/app/helpers/application_helper.rb

@@ -114,4 +114,9 @@ module ApplicationHelper
       Iqvoc.title
     end
   end
+
+  def loading_indicator(label)
+    "<i class=\"fa fa-spin fa-spinner\"></i> #{label}"
+  end
+
 end

data/app/helpers/concepts_helper.rb

@@ -16,8 +16,8 @@
 
 module ConceptsHelper
   # if `broader` is supplied, the tree's direction is reversed (descendants represent broader relations)
-  def treeview(concepts, broader = false)
-    render 'concepts/hierarchical/treeview', concepts: concepts, broader: broader
+  def treeview(concepts, broader = false, dragabble = false)
+    render "concepts/hierarchical/treeview", concepts: concepts, broader: broader, dragabble: false
   end
 
   # turns a hash of concept/relations pairs of arbitrary nesting depth into the

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

@@ -46,24 +46,34 @@ class Concept::Relation::Base < ActiveRecord::Base
 
   def self.by_owner_origin(owner_origin)
     includes(:owner).merge(Concept::Base.by_origin(owner_origin))
+                    .references(:concepts)
   end
 
   def self.by_target_origin(target_origin)
-    includes(:target).
-    merge(Concept::Base.by_origin(target_origin)).
-    references(:concepts)
+    includes(:target).merge(Concept::Base.by_origin(target_origin))
+                     .references(:concepts)
   end
 
   def self.target_editor_selectable
     includes(:target).merge(Concept::Base.editor_selectable)
+                     .references(:concepts)
+  end
+
+  def self.published_with_newer_versions
+    includes(:target).merge(Concept::Base.published_with_newer_versions)
+                     .references(:concepts)
   end
 
   def self.published
-    includes(:target).merge(Concept::Base.published)
+    includes(:target).merge(Concept::Base.published).references(:concepts)
+  end
+
+  def self.unpublished
+    includes(:target).merge(Concept::Base.unpublished).references(:concepts)
   end
 
   def self.target_in_edit_mode
-    joins(:target).merge(Concept::Base.in_edit_mode)
+    joins(:target).merge(Concept::Base.in_edit_mode).references(:concepts)
   end
 
   # ********* Methods

data/app/models/concept/skos/scheme.rb

@@ -84,4 +84,14 @@ class Concept::SKOS::Scheme < Concept::Base
       Iqvoc::Concept.base_class.where(origin: @inline_top_concept_origins).update_all(top_term: true)
     end
   end
+
+  def mono_hierarchy?
+    Iqvoc::Concept.broader_relation_class.new.kind_of?(
+      Concept::Relation::SKOS::Broader::Mono
+    )
+  end
+
+  def poly_hierarchy?
+    !mono_hierarchy?
+  end
 end

data/app/views/concepts/hierarchical/_treeview.html.erb

@@ -1,18 +1,31 @@
-<% hcpath = hierarchical_concepts_path(:format => :json, :published => params[:published], :broader => broader || nil) %>
-<ul class="hybrid-treeview" data-url="<%= hcpath %>">
+<% hcpath = hierarchical_concepts_path(:format => :json, :published => params[:published], :broader => broader || nil) unless hcpath %>
+<% if dragabble %>
+<ul class="hybrid-treeview" data-url="<%= hcpath %>"
+  data-dragabble="true"
+  data-polyhierarchy-support="<%= Iqvoc::Concept.root_class.instance.poly_hierarchy? %>"
+  data-save-label="<%= t('txt.common.move') %>"
+  data-copy-label="<%= t('txt.common.copy') %>"
+  data-undo-label="<%= t('txt.common.reset') %>">
+<% else %>
+  <ul class="hybrid-treeview" data-url="<%= hcpath %>">
+<% end %>
   <% concepts.select { |c| can? :read, c }.each do |concept| %>
     <% has_children = broader ? concept.broader_relations.any? : concept.narrower_relations.any? %>
 
-    <li class="<%= has_children ? "hasChildren" : "" %>" id="<%= concept.id %>">
-      <%= link_to(concept.pref_label.to_s, concept_url(:id => concept)) %>
+    <li class="<%= has_children ? "hasChildren" : "" %>" id="<%= concept.id %>"
+      data-has-children="<%= (params[:broader] ? concept.broader_relations.any? : concept.narrower_relations.any?) %>"
+      data-update-url="<%= move_concept_url(concept, format: :json) %>"
+      data-published="<%= concept.published? %>"
+    >
+      <% if concept.published? %>
+        <%= link_to(concept.pref_label.to_s, concept_url(id: concept)) %>
+      <% else %>
+        <%= link_to(concept.pref_label.to_s, concept_url(id: concept, published: 0)) %>
+      <% end %>
+
       <% if concept.additional_info.present? %>
         (<%= concept.additional_info %>)
       <% end %>
-      <% if has_children %>
-        <ul>
-          <li><span class="placeholder">&nbsp;</span></li>
-        </ul>
-      <% end %>
     </li>
   <% end %>
 </ul>

data/app/views/concepts/hierarchical/index.html.erb

@@ -2,4 +2,8 @@
   :desc => t('txt.views.navigation.hierarchical') %>
 <%= render 'concepts/sidebars/plural' %>
 
-<%= treeview @concepts %>
+<% if params[:published] == '0' %>
+  <%= render "concepts/hierarchical/treeview", concepts: @concepts, broader: false, dragabble: true %>
+<% else %>
+  <%= treeview @concepts %>
+<% end %>

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

@@ -1,5 +1,5 @@
 <% if association_objects_in_editing_mode && association_objects_in_editing_mode[:concept_relations].any? %>
-  <%= alert(:notice, :header => t('txt.common.referenced_concepts')) do %>
+  <%= alert(:info, :header => t('txt.common.referenced_concepts')) do %>
   <ul>
     <% association_objects_in_editing_mode[:concept_relations].each do |concept_relation| %>
       <li>

data/app/views/concepts/scheme/show.html.erb

@@ -15,5 +15,5 @@
 
 <div class="relation panel">
   <h3><%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %></h3>
-  <%= treeview @scheme.top_concepts %>
+  <%= treeview @top_concepts %>
 </div>

data/app/views/concepts/sidebars/_plural.html.erb

@@ -3,11 +3,17 @@
   <%= sidebar_item :text => t("txt.views.navigation.hierarchical"),
       :icon => 'list-alt',
       :path => hierarchical_concepts_path,
-      :active => params[:controller] == 'concepts/hierarchical' %>
+      :active => params[:controller] == 'concepts/hierarchical' && params[:published] != '0' %>
   <%= sidebar_item :text => t("txt.views.navigation.alphabetical"),
       :icon => 'list-alt',
       :path => alphabetical_concepts_path(:prefix => 'a'),
-      :active => params[:controller] == 'concepts/alphabetical' %>
+      :active => (params[:controller] == 'concepts/alphabetical') %>
+  <% if can?(:update, Iqvoc::Concept.base_class) %>
+    <%= sidebar_item :text => t("txt.views.navigation.draft"),
+        :icon => 'list-alt',
+        :path => hierarchical_concepts_path(published: 0),
+        :active => (params[:controller] == 'concepts/hierarchical' && params[:published] == '0') %>
+  <% end %>
   <%= sidebar_item :text => t("txt.views.navigation.expired"),
       :icon => 'list-alt',
       :path => expired_concepts_path(:prefix => 'a'),

data/app/views/imports/index.html.erb

@@ -1,15 +1,18 @@
 <%= page_header :title => t('txt.views.import.title') %>
 <%= render 'dashboard/sidebar' %>
 
-<%= bootstrap_form_for @import, :multipart => true, :layout => :horizontal, label_col: "col-sm-3", control_col: "col-sm-9" do |f| %>
+<%= bootstrap_form_for @import, multipart: true, layout: :horizontal, label_col: 'col-sm-3', control_col: 'col-sm-9' do |f| %>
   <%= f.file_field :import_file %>
-  <%= f.text_field :default_namespace, :value => root_url(:format => nil, :lang => nil, :trailing_slash => true).gsub(/\/\/$/, "/") %>
+  <%= f.text_field :default_namespace, value: root_url(format: nil, lang: nil, trailing_slash: true).gsub(/\/\/$/, "/") %>
 
   <%= f.form_group do %>
-    <%= f.check_box :publish, :value => 1, :checked => true %>
+    <%= f.check_box :publish, value: 1, checked: true %>
   <% end %>
   <%= f.form_group do %>
-    <%= f.submit t('txt.views.import.title'), :class => 'btn btn-primary' %>
+    <%= f.button t('txt.views.import.title'),
+        class: 'btn btn-primary',
+        data: {disable_with: loading_indicator(t('txt.views.import.title'))}
+    %>
   <% end %>
 <% end %>
 

data/app/views/partials/concept/relation/skos/_narrower.html.erb

@@ -3,7 +3,11 @@
   <div class="relation-body">
     <% if concept.narrower_relations.any? %>
       <div class="selector">
-        <%= treeview(concept.narrower_relations.map(&:target)) %>
+        <% if(params[:published] == '0') %>
+          <%= treeview(concept.narrower_relations.published_with_newer_versions.map(&:target)) %>
+        <% else %>
+          <%= treeview(concept.narrower_relations.published.map(&:target)) %>
+        <% end %>
       </div>
     <% end %>
   </div>

data/app/views/user_sessions/_form.html.erb

@@ -3,6 +3,6 @@
   <%= f.email_field :email %>
   <%= f.password_field :password %>
   <%= f.form_group do %>
-    <%= submit_tag t("txt.views.user_sessions.login"), :class => 'btn btn-primary' %>
+    <%= button_tag t("txt.views.user_sessions.login"), :class => 'btn btn-primary', data: {disable_with: loading_indicator(t("txt.views.user_sessions.login"))} %>
   <% end %>
 <% end %>

data/config/database.yml

@@ -1,16 +1,9 @@
-# development:
-#   adapter: postgresql
-#   encoding: unicode
-#   database: iqvoc_development
-#   username: iqvoc
-#   password:
-#   pool: 5
-
 development:
   adapter: mysql2
   encoding: utf8
   reconnect: false
   database: iqvoc_development
+  pool: 5
   username: root
   password:
   host: 127.0.0.1
@@ -20,6 +13,7 @@ test:
   encoding: utf8
   reconnect: false
   database: iqvoc_test
+  pool: 5
   username: root
   password:
   host: 127.0.0.1
@@ -28,7 +22,8 @@ production:
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: iqvoc_development
+  database: iqvoc_production
+  pool: 5
   username: root
   password:
-  host: 127.0.0.1
+  host: 127.0.0.1

data/config/initializers/secret_token.rb

@@ -24,5 +24,5 @@ if Iqvoc.const_defined?(:Application)
 
   # Run `rake secret` and uncomment the following line
   # Replace the secret-placeholder with your generated token
-  Iqvoc::Application.config.secret_key_base = '2650c4d1cb3e8d4eb9dd5538092633e736d73fd034306479d6d9406bb64c9e345291bc78135aa6594595dfa53678706fdac3443750c39c2d796595410dba9c44'
+  Iqvoc::Application.config.secret_key_base = 'e72a6f3972c3ece769b477d9e03f1da2e70088c5cb1a65423be9438936de75100b0009faac0ab303b9e036ebaaf42300e9923b46060090c929b5319002f131ee'
 end

data/config/locales/de.yml

@@ -50,7 +50,9 @@ de:
      value: "Wert"
      back: Zurück
      welcome: "Hallo %{user_name}"
+     move: "Verschieben"
      save: "Speichern"
+     copy: "Kopieren"
      reset: "Zurücksetzen"
      language: "Sprache"
      add_note: "Hinzufügen"
@@ -165,6 +167,7 @@ de:
        instance_configuration: "Konfiguration"
        hierarchical: "Hierarchisch"
        alphabetical: "Alphabetisch"
+       draft: "Bearbeitung"
        expired: "Abgelaufene"
        search: "Suche"
        about: "Über"

data/config/locales/en.yml

@@ -50,7 +50,9 @@ en:
      value: "Value"
      back: Back
      welcome: "Hello %{user_name}"
+     move: "Move"
      save: "Save"
+     copy: 'Copy'
      reset: "Reset"
      language: "Language"
      add_note: "Add"
@@ -173,6 +175,7 @@ en:
        instance_configuration: "Configuration"
        hierarchical: "Hierarchical"
        alphabetical: "Alphabetical"
+       draft: "Draft"
        expired: "Expired"
        search: "Search"
        about: "About"

data/config/routes.rb

@@ -52,6 +52,8 @@ Rails.application.routes.draw do
     post 'concepts/:origin/to_review'   => 'concepts/versions#to_review', as: 'concept_versions_to_review'
     get 'concepts/:origin/consistency_check' => 'concepts/versions#consistency_check', as: 'concept_versions_consistency_check'
 
+    patch 'concepts/:origin/move'       => 'concepts#move', as: 'move_concept'
+
     post 'collections/:origin/branch'      => 'collections/versions#branch',    as: 'collection_versions_branch'
     post 'collections/:origin/merge'       => 'collections/versions#merge',     as: 'collection_versions_merge'
     post 'collections/:origin/lock'        => 'collections/versions#lock',      as: 'collection_versions_lock'