collections_controller.rb in iqvoc-4.4.0

- old
+ new

@@ -13,58 +13,72 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 class CollectionsController < ApplicationController
-
   def index
     authorize! :read, Iqvoc::Collection.base_class
 
     respond_to do |format|
       format.html do
-        @top_collections = Iqvoc::Collection.base_class.with_pref_labels
+        @top_collections = Iqvoc::Collection.base_class.with_pref_labels.published
         @top_collections = if params[:root].present?
           @top_collections.by_parent_id(params[:root])
         else
           @top_collections.tops
         end
 
-        @top_collections.sort! { |a, b| a.pref_label.to_s <=> b.pref_label.to_s }
+        @top_collections.to_a.sort! { |a, b| a.pref_label.to_s <=> b.pref_label.to_s }
 
-        ActiveRecord::Associations::Preloader.new(@top_collections, {:members => :target}).run
+        ActiveRecord::Associations::Preloader.new.preload(@top_collections, { members: :target })
       end
       format.json do # For the widget and treeview
         response = if params[:root].present?
-          collections = Iqvoc::Collection.base_class.with_pref_labels.by_parent_id(params[:root])
+          collections = Iqvoc::Collection.base_class.with_pref_labels.published.by_parent_id(params[:root])
           collections.map do |collection|
-            { :id => collection.id,
-              :url => collection_path(:id => collection, :format => :html),
-              :text => CGI.escapeHTML(collection.pref_label.to_s),
-              :hasChildren => collection.subcollections.any?,
-              :additionalText => " (#{collection.additional_info})"
+            { id: collection.id,
+              url: collection_path(id: collection, format: :html),
+              text: CGI.escapeHTML(collection.pref_label.to_s),
+              hasChildren: collection.subcollections.any?,
+              additionalText: " (#{collection.additional_info})"
             }
           end
         else
-          collections = Iqvoc::Collection.base_class.with_pref_labels.merge(Label::Base.by_query_value("#{params[:query]}%"))
+          collections = Iqvoc::Collection.base_class.with_pref_labels.published.merge(Label::Base.by_query_value("#{params[:query]}%"))
           collections.map do |c|
             collection_widget_data(c)
           end
         end
-        render :json => response
+        render json: response
       end
     end
   end
 
   def show
-    @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last!
+    published = params[:published] == '1' || !params[:published]
+    scope = Iqvoc::Collection.base_class.by_origin(params[:id])
+
+    if published
+      scope = scope.published
+      @new_collection_version = Iqvoc::Collection.base_class.by_origin(params[:id]).unpublished.last
+    else
+      scope = scope.unpublished
+    end
+
+    @collection = scope.last!
     authorize! :read, @collection
 
     # 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(@collection,
+    ActiveRecord::Associations::Preloader.new.preload(@collection,
       [:pref_labels,
-        {:members => {:target => [:pref_labels] + Iqvoc::Concept.base_class.default_includes}}]).run
+        { members: { target: [:pref_labels] + Iqvoc::Collection.base_class.default_includes } }])
+
+    respond_to do |format|
+      format.html { published ? render('show_published') : render('show_unpublished') }
+      format.any(:rdf, :ttl, :nt)
+    end
   end
 
   def new
     authorize! :create, Iqvoc::Collection.base_class
 
@@ -73,62 +87,65 @@
   end
 
   def create
     authorize! :create, Iqvoc::Collection.base_class
 
-    @collection = Iqvoc::Collection.base_class.new(params[:concept])
+    @collection = Iqvoc::Collection.base_class.new(concept_params)
 
     if @collection.save
-      flash[:success] = I18n.t("txt.controllers.collections.save.success")
-      redirect_to collection_path(:id => @collection)
+      flash[:success] = I18n.t('txt.controllers.collections.save.success')
+      redirect_to collection_path(published: 0, id: @collection.origin)
     else
-      flash.now[:error] = I18n.t("txt.controllers.collections.save.error")
+      flash.now[:error] = I18n.t('txt.controllers.collections.save.error')
       render :new
     end
   end
 
   def edit
     @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last!
     authorize! :update, @collection
 
     # 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(@collection, [
+    ActiveRecord::Associations::Preloader.new.preload(@collection, [
         :pref_labels,
-        {:members => {:target => [:pref_labels] + Iqvoc::Concept.base_class.default_includes}}]).run
+        { members: { target: [:pref_labels] + Iqvoc::Concept.base_class.default_includes } }])
 
     build_note_relations
   end
 
   def update
     @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last!
     authorize! :update, @collection
 
-    if @collection.update_attributes(params[:concept])
-      flash[:success] = I18n.t("txt.controllers.collections.save.success")
-      redirect_to collection_path(:id => @collection)
+    if @collection.update_attributes(concept_params)
+      flash[:success] = I18n.t('txt.controllers.collections.save.success')
+      redirect_to collection_path(@collection, published: 0)
     else
-      flash.now[:error] = I18n.t("txt.controllers.collections.save.error")
+      flash.now[:error] = I18n.t('txt.controllers.collections.save.error')
       render :edit
     end
   end
 
   def destroy
     @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last!
     authorize! :destroy, @collection
 
     if @collection.destroy
-      flash[:success] = I18n.t("txt.controllers.collections.destroy.success")
+      flash[:success] = I18n.t('txt.controllers.collections.destroy.success')
       redirect_to collections_path
     else
-      flash.now[:error] = I18n.t("txt.controllers.collections.destroy.error")
-      render :action => :show
+      flash.now[:error] = I18n.t('txt.controllers.collections.destroy.error')
+      render action: :show
     end
   end
 
   private
 
+  def concept_params
+    params.require(:concept).permit!
+  end
+
   def build_note_relations
     @collection.note_skos_definitions.build if @collection.note_skos_definitions.empty?
   end
-
 end