Skip to content

Commit 7c1b1e7

Browse files
committed
Rename: ScrivitoController -> CmsController
CmsController is defined and used by Scrivito, so we cannot rename the controller like this: 76d3532
1 parent 40010bd commit 7c1b1e7

File tree

6 files changed

+6
-8
lines changed

6 files changed

+6
-8
lines changed

app/controllers/blog_post_page_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class BlogPostPageController < ScrivitoController
1+
class BlogPostPageController < CmsController
22

33
def index
44
if @obj.permalink.to_s.include?("sotechsha/")

app/controllers/scrivito_controller.rb renamed to app/controllers/cms_controller.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# -*- coding: utf-8 -*-
2-
class ScrivitoController < ApplicationController
1+
class CmsController < ApplicationController
32
include Scrivito::ControllerActions
43

54
title ||= ENV['SCRIVITO_WORKSPACE'] || 'DEFAULT_WORKSPACE'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
class LoginPageController < ScrivitoController
1+
class LoginPageController < CmsController
22
end

app/controllers/plain_page_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class PlainPageController < ScrivitoController
1+
class PlainPageController < CmsController
22
#skip_before_action :verify_authenticity_token, only: [:index]
33

44
def index

app/controllers/sessions_controller.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# -*- coding: utf-8 -*-
2-
class SessionsController < ScrivitoController
1+
class SessionsController < CmsController
32
before_action :logged_in_user, only: [:destroy]
43

54
def create

app/controllers/sotechsha_overview_page_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class SotechshaOverviewPageController < ScrivitoController
1+
class SotechshaOverviewPageController < CmsController
22
def index
33
@sts_posts = BlogPostPage.where(:_permalink, :starts_with,
44
'sotechsha/').order(created: :asc)

0 commit comments

Comments
 (0)