list browser created

[pettanr/pettanr.git] / app / controllers / original_pictures_controller.rb

diff --git a/app/controllers/original_pictures_controller.rb b/app/controllers/original_pictures_controller.rb
index 0b651ff..27d8b01 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -1,5 +1,6 @@
 class OriginalPicturesController < ApplicationController
-  before_filter :authenticate_author!, :except => [:index, :show]
+  before_filter :authenticate_author!, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
+  before_filter :authenticate_admin!, :only => [:list, :browse]
 
   private
   
@@ -34,11 +35,15 @@ class OriginalPicturesController < ApplicationController
   # GET /original_pictures
   # GET /original_pictures.json
   def index
-    @original_pictures = OriginalPicture.all
+    @original_pictures = OriginalPicture.find(:all, 
+      :include => [:artist, :lisence, :resource_picture], :order => 'updated_at', :limit => 20
+    )
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @original_pictures }
+      format.json { render :json => @original_pictures.to_json(
+        :include => [:resource_picture, :artist, :lisence]
+      ) }
     end
   end
 
@@ -61,6 +66,24 @@ class OriginalPicturesController < ApplicationController
     end
   end
 
+  def list
+    @original_pictures = OriginalPicture.all
+
+    respond_to do |format|
+      format.html { render layout: 'system' }
+      format.json { render json: @original_pictures }
+    end
+  end
+
+  def browse
+    @original_picture = OriginalPicture.find(params[:id])
+
+    respond_to do |format|
+      format.html { render layout: 'system' }
+      format.json { render json: @original_picture }
+    end
+  end
+
   def refresh
     @original_picture = OriginalPicture.find(params[:id])
     img = Magick::Image.from_blob(@original_picture.restore).shift
@@ -99,6 +122,7 @@ class OriginalPicturesController < ApplicationController
     @original_picture = OriginalPicture.new
     img = set_image params
     @original_picture.artist_id = current_author.artist.id
+    @original_picture.lisence_id = current_author.artist.default_lisence_id
 
     respond_to do |format|
       OriginalPicture.transaction do