media_picker_controller.rb in spina-2.1.0

- old
+ new
@@ -1,39 +1,15 @@
 module Spina
   module Admin
     class MediaPickerController < AdminController
-      before_action :set_media_folders
-      before_action :set_selected_images
-
+      
       def show
-        @images = Image.where(media_folder: @media_folder).order(created_at: :desc).page(params[:page]).per(25)
-        @mode = params[:mode]
-
-        if selected_ids.any?
-          @images = @images.reorder(Arel.sql("CASE WHEN id IN(#{selected_ids.join(', ')}) THEN 0 ELSE 1 END, created_at DESC"))
+        @images = Spina::Image.sorted.with_attached_file.page(params[:page]).per(16)
+        
+        if @media_folder = Spina::MediaFolder.find_by(id: params[:media_folder_id])
+          @images = @images.where(media_folder: @media_folder)
         end
-
-        respond_to do |format|
-          format.html { render layout: false }
-          format.js { render :infinite_scroll if params[:page].present? }
-        end
       end
-
-      private
-
-        def set_media_folders
-          @media_folders = MediaFolder.order(:name).joins(:images).uniq
-          @media_folder = MediaFolder.find(params[:media_folder_id]) if params[:media_folder_id].present?
-        end
-
-        def set_selected_images
-          @selected_images = Image.where(id: selected_ids).sort_by{|image| selected_ids.index(image.id)}
-        end
-
-        def selected_ids
-          params[:selected_ids].present? ? params[:selected_ids].map(&:to_i) : []
-        end
-        helper_method :selected_ids
-
+      
     end
   end
 end