fix Manifest

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

diff --git a/app/controllers/system_pictures_controller.rb b/app/controllers/system_pictures_controller.rb
index 374788c..58bd89b 100644 (file)
--- a/app/controllers/system_pictures_controller.rb
+++ b/app/controllers/system_pictures_controller.rb
@@ -1,25 +1,30 @@
 class SystemPicturesController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  if MagicNumber['run_mode'] == 0
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
     before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
   else
-    before_filter :authenticate_resource_reader, :only => [:index, :show]
+    before_filter :authenticate_resource_reader, :only => [:index, :show, :speech_balloon_templates, :licenses]
     before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
   end
   before_filter :authenticate_admin!, :only => [:list, :browse, :new, :create]
 
-  @@model = SystemPicture
+  def self.model
+    SystemPicture
+  end
+  
   def index
-    set_filer
-
-    respond_to do |format|
-      format_filer format
-      format.json { render json: @items.to_json(@@model.list_json_opt) }
-    end
+    public_list
   end
-
+  
+  def speech_balloon_templates
+    has_many_list
+  end
+  
+  def licenses
+    has_many_list
+  end
+  
   def show
     @item = SystemPicture.show(params[:id], @operators)