fix: omniauth twitter

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

diff --git a/app/controllers/comics_controller.rb b/app/controllers/comics_controller.rb
index 5a5312b..73851fc 100644 (file)
--- a/app/controllers/comics_controller.rb
+++ b/app/controllers/comics_controller.rb
@@ -1,27 +1,33 @@
 class ComicsController < ApplicationController
   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]
+    before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
-    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
-
-  def self.model
-    Comic
+    before_action :authenticate_reader, :only => [
+      :index, :show, :play, :by_story, :by_author
+    ]
+    before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
   
   def index
     filer_list
   end
-
+  
+  def by_story
+    filer_list param: params[:id]
+  end
+  
   def by_author
-    filer_list
+    filer_list param: params[:id]
   end
-
+  
   def show_html_format format
     format.html {
+      @play_list = Locmare::ListGroup.list(
+        'comic_stories', 'by_comic', @operators, 
+        {:id => @item.id, :page_size => -1}  # set no limit options
+      )
     }
   end
   
@@ -35,13 +41,19 @@ class ComicsController < ApplicationController
       format.rss 
     end
   end
-
-  def count
-    list_count
-  end
   
-  def count_by_author
-    list_count
+  def play
+    set_play
+    @finder.per(-1)    # no limit no pager
+    play_list
+    respond_to do |format|
+      format.html {
+        if @item.own? @operators
+          @new_story_items = assist_items('home', 'stories', finder: :find_private, param: @operators)
+        end
+      }
+      list_json_format @finder, format
+    end
   end
   
   def new
@@ -53,53 +65,27 @@ class ComicsController < ApplicationController
   end
   
   def create
-    @comic = Comic.new
-    @comic.supply_default 
-    @comic.attributes = params[:comic]
-    @comic.overwrite @operators
-
-    respond_to do |format|
-      if @comic.save
-        flash[:notice] = I18n.t('flash.notice.created', :model => Comic.model_name.human)
-        format.html { redirect_to @comic }
-        format.json { render json: @comic.to_json(Comic.show_json_opt), status: :created, location: @comic }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_created', :model => Comic.model_name.human)
-        format.html { render action: "new" }
-        format.json { render json: @comic.errors, status: :unprocessable_entity }
-      end
-    end
+    set_model
+    @item = @my_model_class.new
+    @item.supply_default 
+    @my_model_class.fold_extend_settings params[@my_model_class.item_name]
+    @item.attributes = @item.permit_params params
+    @item.overwrite @operators
+    render_create
   end
-
+  
   def update
-    @comic = Comic.edit(params[:id], @operators)
-    @comic.attributes = params[:comic]
-    @comic.overwrite @operators
-    respond_to do |format|
-      if @comic.save
-        flash[:notice] = I18n.t('flash.notice.updated', :model => Comic.model_name.human)
-        format.html { redirect_to @comic }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_updated', :model => Comic.model_name.human)
-        format.html { render action: "edit" }
-        format.json { render json: @comic.errors, status: :unprocessable_entity }
-      end
-    end
+    set_edit
+    @my_model_class.fold_extend_settings params[@my_model_class.item_name]
+    @item.attributes = @item.permit_params params
+    @item.overwrite @operators
+    render_update
   end
-
+  
   def destroy
-    @comic = Comic.edit(params[:id], @operators)
-    respond_to do |format|
-      if @comic.destroy_with_story
-        flash[:notice] = I18n.t('flash.notice.destroyed', :model => Comic.model_name.human)
-        format.html { redirect_to '/home/comics' }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => Comic.model_name.human)
-        format.html { redirect_to @comic }
-        format.json { render json: @comic.errors, status: :unprocessable_entity }
-      end
-    end
+    set_model
+    @item = @my_model_class.edit(params[:id], @operators)
+    render_destroy '/home/' + @item.path_name
   end
+  
 end