add: license publisher

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

diff --git a/app/controllers/comic_stories_controller.rb b/app/controllers/comic_stories_controller.rb
index 88b937b..120935b 100644 (file)
--- a/app/controllers/comic_stories_controller.rb
+++ b/app/controllers/comic_stories_controller.rb
@@ -4,15 +4,11 @@ class ComicStoriesController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_story, :by_comic, :by_author, :count, :count_by_story, :count_by_comic, :count_by_author
+      :index, :show, :by_story, :by_comic, :by_author
     ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
-
-  def self.model
-    ComicStory
-  end
   
   def index
     filer_list
@@ -34,22 +30,10 @@ class ComicStoriesController < ApplicationController
     set_show
     respond_to do |format|
       show_prof_format format
-      format.json { render json: @item.comic_story_as_json(@operators.author) }
+      format.json { render json: @item.to_json }
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_story
-    list_count
-  end
-  
-  def count_by_comic
-    list_count
-  end
-  
   def count_by_author
     list_count
   end
@@ -63,7 +47,7 @@ class ComicStoriesController < ApplicationController
   end
   
   def create
-    @my_model_class = self.class.model
+    set_model
     @item = @my_model_class.new
     @item.supply_default
     @item.attributes = params[@item.item_name]
@@ -71,11 +55,11 @@ class ComicStoriesController < ApplicationController
     @binder = @my_model_class.binder_model.edit(@item.binder_id, @operators) if @item.binder_id
     @panel = @my_model_class.destination_model.show(@item.destination_id, @operators) if @item.destination_id
     
-    leaf_render_create play_scroll_path(@binder)
+    leaf_render_create play_comic_path(@binder)
   end
   
   def update
-    @my_model_class = self.class.model
+    set_model
     @item = @my_model_class.edit(params[:id], @operators)
     ot = @item.t
     @item.attributes = params[@item.item_name]
@@ -85,22 +69,14 @@ class ComicStoriesController < ApplicationController
     # swapable hidden panel
     #@panel = @my_model_class.destination_model.show(@item.destination_id, @operators) if @item.destination_id
     
-    leaf_render_update ot, play_scroll_path(@binder)
+    leaf_render_update ot, play_comic_path(@binder)
   end
   
   def destroy
-    @comic_story = ComicStory.edit(params[:id], @operators)
-    @comic = Comic.edit(@comic_story.comic_id, @operators) if @comic_story.comic_id
-    respond_to do |format|
-      if @comic_story.destroy_and_shorten
-        flash[:notice] = I18n.t('flash.notice.destroyed', :model => ComicStory.model_name.human)
-        format.html { redirect_to play_comic_path(@comic) }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => ComicStory.model_name.human)
-        format.html { redirect_to comic_story_path(@comic_story) }
-        format.json { render json: @comic_story.errors, status: :unprocessable_entity }
-      end
-    end
+    set_model
+    @item = @my_model_class.edit(params[:id], @operators)
+    @binder = @my_model_class.binder_model.edit(@item.binder_id, @operators) if @item.binder_id
+    render_destroy play_comic_path(@binder)
   end
+  
 end