Enable cmtool_user for devise controller

app/controllers/cmtool/application_controller.rb

@@ -1,5 +1,6 @@
 module Cmtool
   class ApplicationController < ::ApplicationController
+    include Cmtool::ControllerGlue
     before_filter :authorize_user, :check_environment, :set_locale
     layout 'cmtool/application'
 
@@ -21,11 +22,6 @@ module Cmtool
       end
     end
 
-    def cmtool_user
-      defined?(super) ? super : current_user
-    end
-    helper_method :cmtool_user
-
     def check_environment
       @cmtool_warnings ||= []
       @cmtool_warnings << 'no_host_specified' unless ( Rails.application.config.action_mailer.default_url_options[:host] rescue false) ||

app/controllers/cmtool/sessions_controller.rb

@@ -1,5 +1,6 @@
 module Cmtool
   class SessionsController < ::Devise::SessionsController
+    include Cmtool::ControllerGlue
     layout 'cmtool/devise'
   end
 end

app/controllers/concerns/cmtool/controller_glue.rb

@@ -0,0 +1,11 @@
+module Cmtool::ControllerGlue
+  extend ActiveSupport::Concern
+  included do
+    helper_method :cmtool_user
+  end
+
+  def cmtool_user
+    defined?(super) ? super : current_user
+  end
+
+end