fix form

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

diff --git a/app/controllers/comics_controller.rb b/app/controllers/comics_controller.rb
index f8f0a04..6580993 100644 (file)
--- a/app/controllers/comics_controller.rb
+++ b/app/controllers/comics_controller.rb
@@ -1,10 +1,9 @@
 class ComicsController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  if MagicNumber['run_mode'] == 0
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
-    before_filter :authenticate_reader, :only => [:top, :index, :show]
+    before_filter :authenticate_reader, :only => [:index, :show, :by_author, :count, :count_by_author]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
@@ -14,14 +13,17 @@ class ComicsController < ApplicationController
   end
   
   def index
-    public_list
+    filer_list
+  end
+
+  def by_author
+    filer_list
   end
 
   def show
     @item = Comic.show(params[:id], @operators)
     respond_to do |format|
       format.html {
-        @comic = @item
       }
       format_prof format
       format.json { render json: @item.to_json(Comic.show_json_opt) }
@@ -31,30 +33,21 @@ class ComicsController < ApplicationController
   end
 
   def count
-    @comic = {:count => Comic.visible_count}
-    respond_to do |format|
-      format.json { render json: @comic.to_json }
-    end
+    list_count
+  end
+  
+  def count_by_author
+    list_count
   end
   
   def new
-    @comic = Comic.new
-    @comic.supply_default
-    respond_to do |format|
-      format.html
-      format.js
-      format.json { render json: @comic.to_json(Comic.show_json_opt) }
-    end
+    form_new
   end
-
+  
   def edit
-    @comic = Comic.edit(params[:id], @operators)
-    respond_to do |format|
-      format.html 
-      format.js
-    end
+    form_edit
   end
-
+  
   def create
     @comic = Comic.new
     @comic.supply_default