end of day commit

2012-08-29 17:42:04 +02:00
parent 89700f36e9
commit 8213bae2c6
57 changed files with 1109 additions and 128 deletions
@@ -14,9 +14,9 @@ class ApplicationController < ActionController::Base
    end
  end
  def check_active_list_state
-    if session[:active_list_id]
+    if current_user.try(:active_list_id)
      unless active_list.active?
-        session[:active_list_id] = nil
+        current_user.list_is_closed!
        redirect_to user_root_path, alert: t('messages.the_list_has_been_closed', list: List.model_name.human)
      end
    end
@@ -24,8 +24,8 @@ class ApplicationController < ActionController::Base
  end

  def active_list
-    return nil unless session[:active_list_id].present?
-    @active_list ||= List.find(session[:active_list_id])
+    return nil unless current_user.try(:active_list_id).present?
+    @active_list ||= List.find(current_user.active_list_id)
  end
  alias :active_list_object :active_list
  helper_method :active_list_object