Skip to content

Commit 6dc7651

Browse files
committed
Avoid overriding ScrivitoHelper module that collapses
1 parent ddd51a8 commit 6dc7651

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

app/controllers/scrivito_controller.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# -*- coding: utf-8 -*-
22
class ScrivitoController < ApplicationController
3-
include ScrivitoHelper
43
include Scrivito::ControllerActions
54

5+
# TODO: There may be smarter detection
6+
USING_SCRIVITO = true
7+
68
title ||= ENV['SCRIVITO_WORKSPACE'] || 'DEFAULT_WORKSPACE'
79
Scrivito::Workspace.create(title: title) unless Scrivito::Workspace.find_by_title(title)
810
Scrivito::Workspace.use(title)

app/helpers/scrivito_helper.rb

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)