X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fballoons_controller.rb;h=cb3a4e8497f693fc4ddfcd4208029f8a9bf00ef0;hb=6cbe57ca7a9cac83fad2f3c66fa097055c1fe803;hp=fda6a8b63c80dc6b231194b967b04a9ba7d3e24d;hpb=6871c7b0c1a7a02d4fe3b8ff597f3978e4df7f89;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/balloons_controller.rb b/app/controllers/balloons_controller.rb
index fda6a8b6..cb3a4e84 100644
--- a/app/controllers/balloons_controller.rb
+++ b/app/controllers/balloons_controller.rb
@@ -1,48 +1,57 @@
 class BalloonsController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  if MagicNumber['run_mode'] == 0
-    before_filter :authenticate_user, :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_reader, :only => [
+      :index, :show, :by_author, :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
+  
+  def self.model
+    Balloon
   end
-  before_filter :authenticate_admin!, :only => [:list, :browse]
   
   def index
-    @page = Balloon.page params[:page]
-    @page_size = Balloon.page_size params[:page_size]
-    @balloons = Balloon.list(@page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @balloons.to_json(Balloon.list_json_opt) }
-    end
+    filer_list
+  end
+  
+  def by_author
+    filer_list
+  end
+  
+  def show_html_format format
+    format.html {
+      @item.boosts 'post'
+      @balloon = @item
+    }
   end
   
   def show
-    @balloon = Balloon.show(params[:id], @author)
+    set_show
     respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @balloon.to_json(Balloon.show_json_opt) }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
   
-  def list
-    @balloons = Balloon.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @balloons }
-    end
+  def count
+    list_count
   end
-
-  def browse
-    @balloon = Balloon.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @balloon }
-    end
+  
+  def count_by_author
+    list_count
   end
-
+  
+  def new
+    form_new
+  end
+  
+  def edit
+    form_edit
+  end
+  
 end