t#:

[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 51987a4..88428c2 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -4,7 +4,6 @@ class OriginalPicturesController < ApplicationController
   before_filter :authenticate_reader, :only => [:show, :history]
   before_filter :authenticate_user, :only => [:index, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_artist, :only => [:index, :new, :edit, :create, :update, :destroy]
-  before_filter :authenticate_admin!, :only => [:list, :browse]
   
   def self.model
     OriginalPicture
@@ -34,46 +33,28 @@ class OriginalPicturesController < ApplicationController
   end
 
   def history
-    @original_picture = OriginalPicture.show(params[:id], [@artist, @admin])
+    @original_picture = OriginalPicture.show(params[:id], @operators)
     @history = @original_picture.history
     
     respond_to do |format|
-      format.html # index.html.erb
+      format.html
       format.json { render json: @history.to_json }
     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 new
     @original_picture = OriginalPicture.new
     @original_picture.supply_default
 
     respond_to do |format|
-      format.html # new.html.erb
+      format.html
       format.js
       format.json { render json: @original_picture.to_json(OriginalPicture.show_json_opt) }
     end
   end
 
   def edit
-    @original_picture = OriginalPicture.edit(params[:id], @artist)
+    @original_picture = OriginalPicture.edit(params[:id], @operators)
     respond_to do |format|
       format.html
       format.js
@@ -88,7 +69,7 @@ class OriginalPicturesController < ApplicationController
     end
     @original_picture = OriginalPicture.new
     @original_picture.supply_default
-    @original_picture.overwrite @artist
+    @original_picture.overwrite @operators
 
     respond_to do |format|
       if @original_picture.store(@imager)
@@ -109,8 +90,8 @@ class OriginalPicturesController < ApplicationController
     else
       nil
     end
-    @original_picture = OriginalPicture.edit(params[:id], @artist)
-    @original_picture.overwrite @artist
+    @original_picture = OriginalPicture.edit(params[:id], @operators)
+    @original_picture.overwrite @operators
 
     respond_to do |format|
       if @original_picture.store(@imager)
@@ -126,7 +107,7 @@ class OriginalPicturesController < ApplicationController
   end
 
   def destroy
-    @original_picture = OriginalPicture.edit(params[:id], @artist)
+    @original_picture = OriginalPicture.edit(params[:id], @operators)
     
     respond_to do |format|
       if @original_picture.destroy_with_resource_picture