add editor

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

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index fb76c25..a632462 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -4,11 +4,10 @@ class PanelsController < ApplicationController
     before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy, :catch]
     before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy, :catch]
   else
-    before_filter :authenticate_reader, :only => [:index, :show]
+    before_filter :authenticate_reader, :only => [:index, :show, :scroll_panels, :scrolls, :sheet_panels, :sheets, :panel_pictures, :speech_balloons, :ground_pictures, :ground_colors, :by_scroll, :by_sheet, :by_author]
     before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy, :catch]
     before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy, :catch]
   end
-  before_filter :authenticate_admin!, :only => [:list, :browse]
   
   def self.model
     Panel
@@ -17,7 +16,52 @@ class PanelsController < ApplicationController
   def index
     public_list
   end
-
+  
+  def scroll_panels
+    has_many_list
+  end
+  
+  def scrolls
+    has_many_list
+  end
+  
+  def sheet_panels
+    has_many_list
+  end
+  
+  def sheets
+    has_many_list
+  end
+  
+  def panel_pictures
+    has_many_list
+  end
+  
+  def speech_balloons
+    has_many_list
+  end
+  
+  def ground_pictures
+    has_many_list
+  end
+  
+  def ground_colors
+    has_many_list
+  end
+  
+  def by_scroll
+    filter_list
+  end
+  
+  def by_sheet
+    filter_list
+  end
+  
+  def by_author
+    filter_list
+  end
+  
+  
   def show
     @item = Panel.show(params[:id], @operators)
 
@@ -25,10 +69,15 @@ class PanelsController < ApplicationController
       format.html {
         @panel = @item
         if @operators.author
-          @new_scrolls = Scroll.mylist(@operators.author, 1, 5)
-          @fresh_scrolls = ScrollPanel.mylist(@operators.author, 1, 5).map {|sp| sp.scroll}
-          @new_sheets = Sheet.mylist(@operators.author, 1, 5)
-          @fresh_sheets = SheetPanel.mylist(@operators.author, 1, 5).map {|sp| sp.sheet}
+          @new_scroll_items = assist_items('scroll', 'private_list')
+          @new_scroll_filer = assist_filer 'scroll', @new_scroll_items
+          @fresh_scroll_items = assist_items('scroll_panel', 'private_list').map {|sp| sp.scroll}
+          @fresh_scroll_filer = assist_filer 'scroll', @fresh_scroll_items
+          
+          @new_sheet_items = assist_items('sheet', 'private_list')
+          @new_sheet_filer = assist_filer 'sheet', @new_sheet_items
+          @fresh_sheet_items = assist_items('sheet_panel', 'private_list').map {|sp| sp.sheet}
+          @fresh_sheet_filer = assist_filer 'sheet', @fresh_sheet_items
         end
       }
       format_prof format
@@ -43,38 +92,30 @@ class PanelsController < ApplicationController
     end
   end
   
-  def list
-    @panels = Panel.all :order => 'updated_at'
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @panels }
-    end
-  end
-
-  def browse
-    @panel = Panel.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-    end
-  end
-
   def new
     @panel = Panel.new
     @panel.supply_default
-
     respond_to do |format|
-      format.html
+      format.html {
+        @editor = Editor::Editor.new @panel, @operators
+        render :template => 'templates/r/editor/editor', :locals => {
+          :editor => @editor
+        }
+      }
       format.js
       format.json { render json: @panel.panel_elements_as_json }
     end
   end
 
   def edit
-    @panel = Panel.edit(params[:id], @author)
+    @panel = Panel.edit(params[:id], @operators)
     respond_to do |format|
-      format.html
+      format.html {
+        @editor = Editor::Editor.new @panel, @operators
+        render :template => 'templates/r/editor/editor', :locals => {
+          :editor => @editor
+        }
+      }
       format.js
     end
   end
@@ -88,7 +129,7 @@ class PanelsController < ApplicationController
     end
     @prm = params[:panel] || jsn
     respond_to do |format|
-      if @panel.store @prm, @author
+      if @panel.store @prm, @operators
         flash[:notice] = I18n.t('flash.notice.created', :model => Panel.model_name.human)
         format.html { redirect_to @panel }
         format.json { render json: @panel.panel_elements_as_json, status: :created, location: @panel }
@@ -100,14 +141,14 @@ class PanelsController < ApplicationController
   end
 
   def update
-    @panel = Panel.edit(params[:id], @author)
+    @panel = Panel.edit(params[:id], @operators)
     jsn = nil
     if params[:json]
       jsn = JSON.parse(params[:json])
     end
     @prm = params[:panel] || jsn
     respond_to do |format|
-      if @panel.store @prm, @author
+      if @panel.store @prm, @operators
         flash[:notice] = I18n.t('flash.notice.updated', :model => Panel.model_name.human)
         format.html { redirect_to @panel }
         format.json { head :ok }
@@ -119,7 +160,7 @@ class PanelsController < ApplicationController
   end
 
   def destroy
-    @panel = Panel.edit(params[:id], @author)
+    @panel = Panel.edit(params[:id], @operators)
     respond_to do |format|
       Panel.transaction do
         if @panel.destroy_with_elements
@@ -136,11 +177,11 @@ class PanelsController < ApplicationController
   end
   
   def catch
-    @panel = Panel.edit(params[:id], @author)
+    @panel = Panel.edit(params[:id], @operators)
 
     respond_to do |format|
-      @author.working_panel_id = @panel.id
-      if @author.save
+      @operators.author.working_panel_id = @panel.id
+      if @operators.author.save
         format.html { redirect_to @panel }
       else
       end