X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fapplication_controller.rb;h=42e8780635175793491d25b3e87f45335c8143ad;hb=a4838064801c37fddc101f493c654cf0b2c78db4;hp=20457eb547dad955f867558a393cb85155a6349e;hpb=353efb207a7c0caf82ffbbd00a6425f30ebc939d;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 20457eb5..42e87806 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -23,39 +23,32 @@ class ApplicationController < ActionController::Base
       :location => {:controller => params[:controller], :action => params[:action]}
     }
     @server_result[:location][:id] = params[:id] if params[:id]
-    if Admin.count.to_i == 0 or License.count.to_i == 0
-      if params[:controller] == 'system' and params[:action] == 'start'
-      else
-        redirect_to :controller => '/system', :action => 'start'
-      end
+    user = if user_signed_in?
+      current_user
     else
-      user = if user_signed_in?
-        current_user
-      else
-        nil
-      end
-      author = if user
-        user.author
-      else
-        nil
-      end
-      artist = if user
-        user.artist
-      else
-        nil
-      end
-      admin = if admin_signed_in?
-        current_admin
-      else
-        nil
-      end
-      demand_user = if demand_user_signed_in?
-        current_demand_user
-      else
-        nil
-      end
-      @operators = Operator.new [user, author, artist, admin, demand_user]
+      nil
+    end
+    author = if user
+      user.author
+    else
+      nil
+    end
+    artist = if user
+      user.artist
+    else
+      nil
+    end
+    admin = if admin_signed_in?
+      current_admin
+    else
+      nil
     end
+    demand_user = if demand_user_signed_in?
+      current_demand_user
+    else
+      nil
+    end
+    @operators = Operator.new [user, author, artist, admin, demand_user]
   end
   
   def authenticate_reader
@@ -80,7 +73,6 @@ class ApplicationController < ActionController::Base
     else
       respond_to do |format|
         format.html { redirect_to main_app.new_author_path, :status => :found }
-        format.js { render "authors/new" }
         format.json { 
           raise ActiveRecord::Forbidden
         }
@@ -95,7 +87,6 @@ class ApplicationController < ActionController::Base
     else
       respond_to do |format|
         format.html { redirect_to main_app.new_artist_path, :status => :found }
-        format.js { render "artists/new" }
         format.json { 
           raise ActiveRecord::Forbidden
         }
@@ -115,12 +106,14 @@ class ApplicationController < ActionController::Base
   def set_model
     @my_controller = Manifest.manifest.controllers[params[:controller].to_s]
     @my_action = @my_controller.actions[params[:action].to_s]
-    @my_model = Manifest.manifest.models[@my_action.item_name]
+    @my_model = Manifest.manifest.models[@my_controller.item_name]
     @my_model_class = @my_model.classify
   end
   
   def set_list
     set_model
+    @my_list_model = Manifest.manifest.models[@my_action.item_name]
+    @my_list_model_class = @my_list_model.classify
     @list = Locmare::ListGroup.list @my_action.item_name, @my_action.list_name
   end
   
@@ -137,15 +130,20 @@ class ApplicationController < ActionController::Base
           :filer => @filer
         }
       }
-      format.json { render json: @items.to_json }
+      format.json { render json:  @items.map{|i| i.attributes}.to_json }
+      # rails3.2 has problem
+      # y method defined as private
+      # attribute y conflict at PanelPicture, balloon ..etc
+      # use i.attributes[name]
+      # format.json { render json:  @items.to_json }
       format.atom 
       format.rss
     end
   end
   
   def set_play
-    set_model
-    @list = Locmare::ListGroup.list @my_action.item_name, @my_action.list_name
+    set_list
+    @item = @my_model_class.show(params[:id], @operators)
   end
   
   def play_list
@@ -167,7 +165,7 @@ class ApplicationController < ActionController::Base
   def show_prof_format format
     format.prof {
       self.formats = [:html]
-      @profiler = Locmare::Profiler.new @my_model.model_name, @item, @operators
+      @profiler = Locmare::Profiler.new @my_model.item_name, @item, @operators
       render @profiler.template_name, :locals => {
         :profiler => @profiler
       }
@@ -178,6 +176,10 @@ class ApplicationController < ActionController::Base
     format.json { render json: @item.to_json(@my_model_class.show_json_opt) }
   end
   
+  def show_json_format_for_root format
+    format.json { render json: @item.attributes.to_json(@my_model_class.show_json_opt_for_root) }
+  end
+  
   def set_new
     set_model
     @item = @my_model_class.new
@@ -294,7 +296,7 @@ class ApplicationController < ActionController::Base
     }
   end
   
-  def not_update_html_format format
+  def not_updated_html_format format
     format.html {
       flash[:notice] = I18n.t('flash.notice.not_updated', :model => @my_model_class.model_name.human)
       render_form
@@ -310,7 +312,7 @@ class ApplicationController < ActionController::Base
   def render_update redirect_url = nil
     if @item.save
       respond_to do |format|
-        updated_html_format format, redirect_url = nil
+        updated_html_format format, redirect_url
         updated_json_format format
       end
     else
@@ -328,7 +330,7 @@ class ApplicationController < ActionController::Base
     }
   end
   
-  def leaf_not_update_html_format format, redirect_url
+  def leaf_not_updated_html_format format, redirect_url
     format.html {
       flash[:notice] = I18n.t('flash.notice.not_updated', :model => @my_model_class.model_name.human)
       redirect_to redirect_url
@@ -349,6 +351,46 @@ class ApplicationController < ActionController::Base
     end
   end
   
+  def destroyed_html_format format, redirect_url
+    format.html {
+      flash[:notice] = I18n.t('flash.notice.destroyed', :model => @my_model_class.model_name.human)
+      redirect_to redirect_url
+    }
+  end
+  
+  def destroyed_json_format format
+    format.json {
+      head :ok
+    }
+  end
+  
+  def not_destroyed_html_format format
+    format.html {
+      flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => @my_model_class.model_name.human)
+      redirect_to @item
+    }
+  end
+  
+  def not_destroyed_json_format format
+    format.json {
+      render json: @item.errors, status: :unprocessable_entity
+    }
+  end
+  
+  def render_destroy redirect_url = nil
+    if @item.destroy
+      respond_to do |format|
+        destroyed_html_format format, redirect_url
+        destroyed_json_format format
+      end
+    else
+      respond_to do |format|
+        not_destroyed_html_format format
+        not_destroyed_json_format format
+      end
+    end
+  end
+  
   def list_count
     set_list
     j = {:count => @list.count(@operators, {:id => params[:id]})}