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

3 files changed, 9 insertions, 23 deletions

diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb
index f30a85564d4..507b8290a2b 100644
--- a/app/controllers/oauth/applications_controller.rb
+++ b/app/controllers/oauth/applications_controller.rb
@@ -1,6 +1,9 @@
 class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
+  include PageLayoutHelper
+  
   before_action :authenticate_user!
-  before_action :set_title
+
+  layout 'profile'
 
   def index
     head :forbidden and return
@@ -36,10 +39,4 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   rescue_from ActiveRecord::RecordNotFound do |exception|
     render "errors/not_found", layout: "errors", status: 404
   end
-
-  def set_title
-    @title      = "Profile"
-    @title_url  = profile_path
-    @sidebar    = "profile"
-  end
 end
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index c62890ba85b..24025d8c723 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -1,6 +1,7 @@
 class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   before_action :authenticate_resource_owner!
-  before_action :set_title
+
+  layout 'profile'
 
   def new
     if pre_auth.authorizable?
@@ -54,10 +55,4 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   def strategy
     @strategy ||= server.authorization_request(pre_auth.response_type)
   end
-  
-  def set_title
-    @title      = "Profile"
-    @title_url  = profile_path
-    @sidebar    = "profile"
-  end
 end
diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb
index 63c634f376b..3ab6def511c 100644
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@@ -1,16 +1,10 @@
 class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicationsController
-  before_action :set_title
+  include PageLayoutHelper
+
+  layout 'profile'
 
   def destroy
     Doorkeeper::AccessToken.revoke_all_for(params[:id], current_resource_owner)
     redirect_to applications_profile_url, notice: I18n.t(:notice, scope: [:doorkeeper, :flash, :authorized_applications, :destroy])
   end
-
-  private
-  
-  def set_title
-    @title      = "Profile"
-    @title_url  = profile_path
-    @sidebar    = "profile"
-  end
 end