X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fspeeches_controller.rb;h=658f270ea5e95974f244286ff9d806f9d35e3797;hb=9192edc531531a036d23449859b7300e0898d886;hp=24ca9711f55ae0ed51cc7dec34583f3d57150137;hpb=630984f4850fdde8252089bc49bd2614a84f9ef7;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/speeches_controller.rb b/app/controllers/speeches_controller.rb
index 24ca9711..658f270e 100644
--- a/app/controllers/speeches_controller.rb
+++ b/app/controllers/speeches_controller.rb
@@ -1,51 +1,62 @@
 class SpeechesController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  if MagicNumber['run_mode'] == 0
-    before_filter :authenticate_user, :only => []
-    before_filter :authenticate_author, :only => []
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
+    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]
-    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
-    @page = Speech.page params[:page]
-    @page_size = Speech.page_size params[:page_size]
-    @speeches = Speech.list(@page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @speeches.to_json(Speech.list_json_opt) }
-    end
+    filer_list
+  end
+  
+  def by_author
+    filer_list
+  end
+  
+  def by_speech_balloon
+    filer_list
+  end
+  
+  def show_html_format format
+    format.html {
+      @item.boosts 'post'
+      @speech = @item
+    }
   end
   
   def show
-    @speech = Speech.show(params[:id], [@user, @admin])
+    set_show
     respond_to do |format|
-      format.html # show.html.erb
-      format.prof  { render :template => 'top/prof', :layout => true }
-      format.json { render json: @speech.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