Merge branch 'master' of git.sourceforge.jp:/gitroot/pettanr/pettanr

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

diff --git a/app/controllers/speach_balloons_controller.rb b/app/controllers/speach_balloons_controller.rb
index 3297494..c198b99 100644 (file)
--- a/app/controllers/speach_balloons_controller.rb
+++ b/app/controllers/speach_balloons_controller.rb
@@ -1,12 +1,13 @@
 class SpeachBalloonsController < ApplicationController
-  before_filter :authenticate_author!, :except => [:index]
+  before_filter :authenticate_user!, :only => [:index, :show]
+  before_filter :authenticate_admin!, :only => [:list, :browse, :create, :update, :destroy]
 
   private
   
   def validate_param(ft)
     res = nil
-    bl = ft[:border_limit].to_i
-    tl = ft[:tail_limit].to_i
+    bl = ft[:size_count].to_i
+    tl = ft[:tail_count].to_i
     if bl * tl == ft[:balloon_templates_attributes].size
       flag = []
       bl.times do |i|
@@ -16,7 +17,7 @@ class SpeachBalloonsController < ApplicationController
         end
       end
       ft[:balloon_templates_attributes].each do |k, t|
-        flag[t[:border].to_i - 1][t[:tail].to_i - 1] = nil
+        flag[t[:size].to_i - 1][t[:tail].to_i - 1] = nil
       end
       if flag.flatten.compact.size == 0
       else
@@ -28,7 +29,8 @@ class SpeachBalloonsController < ApplicationController
     res
   end
   
-  public  # GET /speach_balloons
+  public
+  # GET /speach_balloons
   # GET /speach_balloons.json
   def index
     @speach_balloons = SpeachBalloon.all
@@ -59,27 +61,28 @@ class SpeachBalloonsController < ApplicationController
     end
   end
 
-  # GET /speach_balloons/new
-  # GET /speach_balloons/new.json
-  def new
-    @speach_balloon = SpeachBalloon.new
+  def list
+    @speach_balloons = SpeachBalloon.all
 
     respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @speach_balloon }
+      format.html { render layout: 'system' }
+      format.json { render json: @speach_balloons }
     end
   end
 
-  # GET /speach_balloons/1/edit
-  def edit
+  def browse
     @speach_balloon = SpeachBalloon.find(params[:id])
+
+    respond_to do |format|
+      format.html { render layout: 'system' }
+      format.json { render json: @speach_balloon }
+    end
   end
 
   # POST /speach_balloons
   # POST /speach_balloons.json
   def create
     @speach_balloon = SpeachBalloon.new(params[:speach_balloon])
-
     if em = validate_param(params[:speach_balloon])
       respond_to do |format|
         format.json { render json: em, status: :unprocessable_entity }