photos_controller.rb in spina-0.10.0

- old
+ new

@@ -11,10 +11,14 @@
         add_breadcrumb I18n.t('spina.website.photos'), spina.admin_photos_path
         @photos = Photo.sorted.page(params[:page])
         @photo = Photo.new
       end
 
+      def media_library
+        redirect_to spina.admin_photos_path
+      end
+
       def create
         @photo = Photo.create!(photo_params)
         respond_to do |format|
           format.js do
             render params[:media_library] ? :create : :create_and_select
@@ -40,25 +44,24 @@
       def link
         @photo = Photo.find(params[:id])
       end
 
       def photo_select
-        selected = params[:selected_photo_id] || Array.new
-        @photos = Photo.order_by_ids(selected).sorted.page(params[:page])
-        @selected_photo = Photo.find(selected)
+        @selected_photo_id = Photo.find_by(id: params[:selected_photo_id]).try(:id)
+        @hidden_field_id = params[:hidden_field_id]
+        @photos = Photo.order_by_ids(@selected_photo_id).sorted.page(params[:page])
         @photo = Photo.new
 
         if params[:page].present?
           render :single_picker_infinite_scroll
         else
           render :photo_select
         end
       end
 
       def photo_collection_select
-        selected = params[:selected_photo_ids] || Array.new
-        @photos = Photo.order_by_ids(selected).sorted.page(params[:page])
-        @selected_photos = Photo.where(id: selected)
+        @selected_photo_ids = Photo.where(id: params[:selected_photo_ids]).ids
+        @photos = Photo.order_by_ids(@selected_photo_ids).sorted.page(params[:page])
         @photo = Photo.new
 
         if params[:page].present?
           render :multi_picker_infinite_scroll
         else