t30329#:i18n flash message

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 125b159..5b32d2e 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,8 +1,28 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  layout :devise_layout if MagicNumber['test_layout']
   before_filter :bf
   
+  def devise_layout
+    if devise_controller?
+      case resource_name
+      when :admin
+        'test'
+      when :user
+        'test'
+      when :demand_user
+        'test'
+      end
+    else
+      'application'
+    end
+  end
+  
   def bf
+    @server_result = {
+      :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
@@ -15,9 +35,34 @@ class ApplicationController < ActionController::Base
         @artist = if @author and @author.artist?
           @author.artist
         else
-          Artist.new author_id: @author.id, email: @user.email, name: @author.name
+          nil
         end
       end
+      @admin = if admin_signed_in?
+        current_admin
+      else
+        nil
+      end
+      @demand_user = if demand_user_signed_in?
+        current_demand_user
+      else
+        nil
+      end
+    end
+  end
+  
+  def authenticate_author
+    if @author
+      true
+    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
+        }
+      end
+      false
     end
   end
   
@@ -36,6 +81,14 @@ class ApplicationController < ActionController::Base
     end
   end
   
+  def set_image(file)
+    if file.respond_to?(:read)
+      file.read
+    else
+      Base64.decode64(file.to_s.gsub(' ', '+'))
+    end
+  end
+  
 =begin
   rescue_from ActiveRecord::RecordNotFound, :with => :render_404