X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fspeeches_controller.rb;h=658f270ea5e95974f244286ff9d806f9d35e3797;hb=85d27b03ef74a6d4775fc345a9f59c9e1736e7c1;hp=0c4a4168f121625301a07f8f15f36b84e6f39480;hpb=2aa1323f37c9fb76373328c25e251291aa9addac;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/speeches_controller.rb b/app/controllers/speeches_controller.rb
index 0c4a4168..658f270e 100644
--- a/app/controllers/speeches_controller.rb
+++ b/app/controllers/speeches_controller.rb
@@ -1,57 +1,62 @@
 class SpeechesController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => []
-    before_filter :authenticate_author, :only => []
+    before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+    before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
   else
-    before_filter :authenticate_reader, :only => [:index, :show, :by_speech_balloon, :by_writing_format]
-    before_filter :authenticate_user, :only => []
-    before_filter :authenticate_author, :only => []
+    before_filter :authenticate_reader, :only => [
+      :index, :show, :by_author, :by_speech_balloon, :count, :count_by_author
+    ]
+    before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+    before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
   end
-  before_filter :authenticate_admin!, :only => [:list, :browse]
+  before_filter :authenticate_admin!, :only => []
 
   def self.model
     Speech
   end
   
   def index
-    public_list
+    filer_list
+  end
+  
+  def by_author
+    filer_list
   end
   
   def by_speech_balloon
-    filter_list
+    filer_list
   end
   
-  def by_writing_format
-    filter_list
+  def show_html_format format
+    format.html {
+      @item.boosts 'post'
+      @speech = @item
+    }
   end
   
   def show
-    @item = Speech.show(params[:id], @operators)
+    set_show
     respond_to do |format|
-      format.html {
-        @speech = @item
-      }
-      format_prof format
-      format.json { render json: @item.to_json(Speech.show_json_opt) }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
   
-  def list
-    @speeches = Speech.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @speeches }
-    end
+  def count
+    list_count
   end
-
-  def browse
-    @speech = Speech.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @speech }
-    end
+  
+  def count_by_author
+    list_count
   end
-
+  
+  def new
+    form_new
+  end
+  
+  def edit
+    form_edit
+  end
+  
 end