X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fauthors_controller.rb;h=2a3e90d00aca19a689c290c5b41532f05e4df12c;hb=3f4cd8c9a4ce4336a659d7ad7f7093c0c1cd6ee9;hp=b532cba82581f43a840d0c6ec0dda8dec701d693;hpb=eed78d25a62c297f6ef0ee6d86c4e94f20a774c0;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/authors_controller.rb b/app/controllers/authors_controller.rb
index b532cba8..2a3e90d0 100644
--- a/app/controllers/authors_controller.rb
+++ b/app/controllers/authors_controller.rb
@@ -1,143 +1,56 @@
 class AuthorsController < 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]
     before_filter :authenticate_author, :only => [:edit, :update]
   else
-    before_filter :authenticate_reader, :only => [:index, :show, :comics, :stories, :panels]
+    before_filter :authenticate_reader, :only => [:index, :show, :count]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update]
     before_filter :authenticate_author, :only => [:edit, :update]
   end
-  before_filter :authenticate_admin!, :only => [:list, :browse]
 
   def index
-    @page = Author.page params[:page]
-    @page_size = Author.page_size params[:page_size]
-    @authors = Author.list(@page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render :json => @authors.to_json(Author.list_json_opt) }
-    end
-  end
-
-  def show
-    @au = Author.show(params[:id], [@user, @admin])
-
-    respond_to do |format|
-      format.html
-      format.json { render :json => @au.to_json(Author.show_json_opt) }
-    end
-  end
-
-  def comics
-    @au = Author.show(params[:id], [@user, @admin])
-
-    @page = Author.page params[:page]
-    @page_size = Author.comic_page_size params[:page_size]
-    @comics = Comic.himlist(@au, @page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @comics.to_json(Comic.list_json_opt) }
-    end
+    filer_list
   end
   
-  def stories
-    @au = Author.show(params[:id], [@user, @admin])
-
-    @page = Author.page params[:page]
-    @page_size = Author.comic_page_size params[:page_size]
-    @stories = Story.himlist(@au, @page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @stories.to_json(Story.list_json_opt) }
-    end
+  def show_html_format format
+    format.html {
+    }
   end
   
-  def panels
-    @au = Author.show(params[:id], [@user, @admin])
-
-    @page = Author.page params[:page]
-    @page_size = Author.panel_page_size params[:page_size]
-    @panels = Panel.himlist(@au, @page, @page_size)
-
+  def show
+    set_show
     respond_to do |format|
-      format.html # index.html.erb
-      format.json { render text: Panel.list_as_json_text(@panels) }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
   
   def count
-    @au = {:count => Author.visible_count}
-    respond_to do |format|
-      format.json { render json: @au.to_json }
-    end
-  end
-  
-  def list
-    @authors = Author.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-    end
-  end
-
-  def browse
-    @au = Author.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-    end
+    list_count
   end
   
   def new
-    @au = Author.new
-    @au.supply_default 
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.js
-      format.json { render json: @au.to_json(Author.show_json_opt) }
-    end
+    form_new
   end
-
+  
   def edit
-    @au = Author.edit(params[:id], @author)
+    form_edit
   end
-
+  
   def create
-    @au = Author.new()
-    @au.supply_default 
-    @au.attributes = params[:author]
-    @au.overwrite @user.id
-    respond_to do |format|
-      if @au.save
-        flash[:notice] = I18n.t('flash.notice.created', :model => Author.model_name.human)
-        format.html { redirect_to root_path }
-        format.json { render json: @au.to_json(Author.show_json_opt), status: :created, location: @artist }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @au.errors, status: :unprocessable_entity }
-      end
-    end
+    set_model
+    @item = @my_model_class.new
+    @item.supply_default 
+    @item.attributes = params[@my_model_class.item_name]
+    @item.overwrite @operators
+    render_create root_path
   end
-
+  
   def update
-    @au = Author.edit(params[:id], @author)
-    @au.attributes = params[:author]
-    @au.overwrite @user.id
-
-    respond_to do |format|
-      if @au.save
-        flash[:notice] = I18n.t('flash.notice.updated', :model => Author.model_name.human)
-        format.html { redirect_to '/home/configure' }
-        format.json { head :ok }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @au.errors, status: :unprocessable_entity }
-      end
-    end
+    set_edit
+    @item.attributes = params[@my_model_class.item_name]
+    @item.overwrite @operators
+    render_update '/home/configure'
   end
 end