Add helpers for header title and sidebar, and move setting those from controllers to layouts.

1 files changed, 5 insertions, 4 deletions

diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb
index 86976ae39e3..c780e0983f9 100644
--- a/app/controllers/profiles/passwords_controller.rb
+++ b/app/controllers/profiles/passwords_controller.rb
@@ -2,9 +2,10 @@ class Profiles::PasswordsController < Profiles::ApplicationController
   skip_before_action :check_password_expiration, only: [:new, :create]
 
   before_action :set_user
-  before_action :set_title
   before_action :authorize_change_password!
 
+  layout :determine_layout
+
   def new
   end
 
@@ -64,11 +65,11 @@ class Profiles::PasswordsController < Profiles::ApplicationController
     @user = current_user
   end
 
-  def set_title
+  def determine_layout
     if [:new, :create].include?(action_name.to_sym)
-      @title = "New password"
+      'application'
     else
-      super
+      'profile'
     end
   end