X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fballoons_controller.rb;h=3e97f891277defe46c967f906b62dd72b43335d7;hb=d2a17869f5a5fb9a33ddad29887c8f03a129c407;hp=eecefdcab5ba905bdbe34644f823f9c46a23c5d2;hpb=2a3517e88668281e10f3fc7efc96c8bf39b684c1;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/balloons_controller.rb b/app/controllers/balloons_controller.rb
index eecefdca..3e97f891 100644
--- a/app/controllers/balloons_controller.rb
+++ b/app/controllers/balloons_controller.rb
@@ -1,57 +1,58 @@
 class BalloonsController < 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_action :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+    before_action :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_action :authenticate_reader, :only => [
+      :index, :show, 
+      :by_author, :by_speech_balloon, :by_speech_balloon_template, :by_system_picture
+    ]
+    before_action :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
   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 {
-        @paginate = Balloon.list_paginate(@page, @page_size)
-        render :template => 'system/filer', :locals => {
-          :items => @balloons, :model => Balloon, 
-          :roles => [@user, @admin], :pager => @paginate
-        }
-      }
-      format.json { render json: @balloons.to_json(Balloon.list_json_opt) }
-    end
+    filer_list
+  end
+  
+  def by_author
+    filer_list param: params[:id]
+  end
+  
+  def by_speech_balloon
+    filer_list param: params[:id]
+  end
+  
+  def by_speech_balloon_template
+    filer_list param: params[:id]
+  end
+  
+  def by_system_picture
+    filer_list param: params[:id]
+  end
+  
+  def show_html_format format
+    format.html {
+      @item.boosts 'post'
+      @balloon = @item
+    }
   end
   
   def show
-    @balloon = Balloon.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: @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 new
+    form_new
   end
-
-  def browse
-    @balloon = Balloon.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @balloon }
-    end
+  
+  def edit
+    form_edit
   end
-
+  
 end