fix new element dialog

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

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index f91a23e..661773b 100644 (file)
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,10 +1,15 @@
 class HomeController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user, :only => [
     :index, :show, :profile, :configure, :create_token, :delete_token, 
-    :comics, :stories, :panels, :resource_pictures, :panel_pictures, :panel_colors, :ground_pictures, :ground_colors
+    :scrolls, :scroll_panels, :comics, :comic_stories, :stories, :story_sheets, 
+    :sheets, :sheet_panels, 
+    :panels, :panel_pictures, :speech_balloons, :balloons, :speeches, :ground_pictures, :ground_colors
+  ]
+  before_filter :authenticate_author, :only => [
+    :scrolls, :scroll_panels, :comics, :comic_stories, :stories, :story_sheets, 
+    :sheets, :sheet_panels, 
+    :panels, :panel_pictures, :speech_balloons, :balloons, :speeches, :ground_pictures, :ground_colors
   ]
-  before_filter :authenticate_author, :only => [:comics, :stories, :panels, :panel_pictures, :panel_colors, :ground_pictures, :ground_colors]
   before_filter :authenticate_artist, :only => [:resource_pictures]
   
   def index
@@ -14,10 +19,24 @@ class HomeController < ApplicationController
   end
   
   def configure
+    @author = @operators.author
+    unless @author
+      @author = Author.new
+      @author.supply_default
+    end
+    @author.boosts 'post'
+    @author_form = Locmare::Bucket.factory @author.item_name, @author, true, true, @operators
+    @artist = @operators.artist
+    unless @artist
+      @artist = Artist.new
+      @artist.supply_default
+    end
+    @artist.boosts 'post'
+    @artist_form = Locmare::Bucket.factory @artist.item_name, @artist, true, true, @operators
   end
   
   def create_token
-    if @user.create_token
+    if @operators.user.create_token
       respond_to do |format|
         flash[:notice] = I18n.t('flash.notice.created', :model => User.human_attribute_name(:authentication_token))
         format.html { redirect_to({:action => :configure}) }
@@ -29,7 +48,7 @@ class HomeController < ApplicationController
   end
   
   def delete_token
-    if @user.delete_token
+    if @operators.user.delete_token
       respond_to do |format|
         flash[:notice] = I18n.t('flash.notice.destroyed', :model => User.human_attribute_name(:authentication_token))
         format.html { redirect_to :action => :configure}
@@ -40,81 +59,68 @@ class HomeController < ApplicationController
     end
   end
   
+  def scrolls
+    filer_list
+  end
+  
+  def scroll_panels
+    filer_list
+  end
+  
   def comics
-    @page = Author.page params[:page]
-    @page_size = Author.comic_page_size params[:page_size]
-    @comics = Comic.mylist(@author, @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 comic_stories
+    filer_list
   end
   
   def stories
-    @page = Author.page params[:page]
-    @page_size = Author.story_page_size params[:page_size]
-    @stories = Story.mylist(@author, @page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render text: Story.list_as_json_text(@stories) }
-    end
+    filer_list
+  end
+  
+  def story_sheets
+    filer_list
+  end
+  
+  def sheets
+    filer_list
+  end
+  
+  def sheet_panels
+    filer_list
   end
   
   def panels
-    @page = Author.page params[:page]
-    @page_size = Author.panel_page_size params[:page_size]
-    @panels = Panel.mylist(@author, @page, @page_size)
-
-    respond_to do |format|
-      format.html 
-      format.json { render text: Panel.list_as_json_text(@panels) }
-    end
+    filer_list
   end
   
   def panel_pictures
-    @page = Author.page params[:page]
-    @page_size = Author.panel_picture_page_size params[:page_size]
-    @panel_pictures = PanelPicture.mylist(@author, @page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @panel_pictures.to_json(PanelPicture.list_json_opt) }
-    end
+    filer_list
+  end
+  
+  def speech_balloons
+    filer_list
+  end
+  
+  def balloons
+    filer_list
+  end
+  
+  def speeches
+    filer_list
   end
   
   def ground_pictures
-    @page = Author.page params[:page]
-    @page_size = Author.ground_picture_page_size params[:page_size]
-    @ground_pictures = GroundPicture.mylist(@author, @page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @ground_pictures.to_json(GroundPicture.list_json_opt) }
-    end
+    filer_list
   end
   
   def ground_colors
-    @page = Author.page params[:page]
-    @page_size = Author.ground_color_page_size params[:page_size]
-    @ground_colors = GroundColor.mylist(@author, @page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @ground_colors.to_json(GroundColor.list_json_opt) }
-    end
+    filer_list
   end
   
   def resource_pictures
-    @page = Author.page params[:page]
-    @page_size = Author.resource_picture_page_size params[:page_size]
-    @resource_pictures = ResourcePicture.mylist(@artist, @page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @resource_pictures.to_json(ResourcePicture.list_json_opt) }
-    end
+    filer_list
   end
   
 end