Commit 81062dd5 authored by Michal Čihař's avatar Michal Čihař

Remove setting for enabling whiteboard

The setting is really not needed, either the whiteboard objects are
there or not.

Issue #159
Signed-off-by: default avatarMichal Čihař <michal@cihar.com>
parent 6869080c
...@@ -222,9 +222,6 @@ HIDE_REPO_CREDENTIALS = getvalue('HIDE_REPO_CREDENTIALS', True) ...@@ -222,9 +222,6 @@ HIDE_REPO_CREDENTIALS = getvalue('HIDE_REPO_CREDENTIALS', True)
# GitHub username for sending pull requests # GitHub username for sending pull requests
GITHUB_USERNAME = getvalue('GITHUB_USERNAME', None) GITHUB_USERNAME = getvalue('GITHUB_USERNAME', None)
# Whiteboard
ENABLE_WHITEBOARD = getvalue('ENABLE_WHITEBOARD', False)
# Default committer # Default committer
DEFAULT_COMMITER_EMAIL = getvalue( DEFAULT_COMMITER_EMAIL = getvalue(
'DEFAULT_COMMITER_EMAIL', 'noreply@weblate.org' 'DEFAULT_COMMITER_EMAIL', 'noreply@weblate.org'
......
...@@ -16,11 +16,9 @@ ...@@ -16,11 +16,9 @@
</p> </p>
{% endif %} {% endif %}
{% if whiteboard_enabled %}
{% for msg in whiteboard_messages %} {% for msg in whiteboard_messages %}
{% show_message 'info whiteboard' msg.message %} {% show_message 'info whiteboard' msg.message %}
{% endfor %} {% endfor %}
{% endif %}
<ul class="nav nav-pills"> <ul class="nav nav-pills">
{% if user.is_authenticated %} {% if user.is_authenticated %}
......
...@@ -567,8 +567,5 @@ ALLOWED_HOSTS = [] ...@@ -567,8 +567,5 @@ ALLOWED_HOSTS = []
# r'/hooks/(.*)$', # Allowing public access to notification hooks # r'/hooks/(.*)$', # Allowing public access to notification hooks
# ) # )
# Enable whiteboard functionality - under development so disabled by default.
ENABLE_WHITEBOARD = False
# Force sane test runner # Force sane test runner
TEST_RUNNER = 'django.test.runner.DiscoverRunner' TEST_RUNNER = 'django.test.runner.DiscoverRunner'
...@@ -93,9 +93,6 @@ LOGGING = { ...@@ -93,9 +93,6 @@ LOGGING = {
} }
} }
# Use whiteboard in tests
ENABLE_WHITEBOARD = True
# Selenium can not clear HttpOnly cookies in MSIE # Selenium can not clear HttpOnly cookies in MSIE
SESSION_COOKIE_HTTPONLY = False SESSION_COOKIE_HTTPONLY = False
......
...@@ -75,7 +75,6 @@ def weblate_context(request): ...@@ -75,7 +75,6 @@ def weblate_context(request):
'login_redirect_url': login_redirect_url, 'login_redirect_url': login_redirect_url,
'hooks_enabled': appsettings.ENABLE_HOOKS, 'hooks_enabled': appsettings.ENABLE_HOOKS,
'whiteboard_enabled': appsettings.ENABLE_WHITEBOARD,
'registration_open': appsettings.REGISTRATION_OPEN, 'registration_open': appsettings.REGISTRATION_OPEN,
'acl_projects': projects, 'acl_projects': projects,
......
...@@ -36,7 +36,6 @@ from PIL import Image ...@@ -36,7 +36,6 @@ from PIL import Image
from weblate.trans.models import WhiteboardMessage, SubProject from weblate.trans.models import WhiteboardMessage, SubProject
from weblate.trans.tests.test_models import RepoTestCase from weblate.trans.tests.test_models import RepoTestCase
from weblate.accounts.models import Profile from weblate.accounts.models import Profile
from weblate.trans.tests import OverrideSettings
class RegistrationTestMixin(object): class RegistrationTestMixin(object):
...@@ -386,7 +385,6 @@ class HomeViewTest(ViewTestCase): ...@@ -386,7 +385,6 @@ class HomeViewTest(ViewTestCase):
response = self.client.get(reverse('home')) response = self.client.get(reverse('home'))
self.assertContains(response, 'Test/Test') self.assertContains(response, 'Test/Test')
@OverrideSettings(ENABLE_WHITEBOARD=True)
def test_home_with_whiteboard(self): def test_home_with_whiteboard(self):
msg = WhiteboardMessage(message='test_message') msg = WhiteboardMessage(message='test_message')
msg.save() msg.save()
...@@ -395,7 +393,6 @@ class HomeViewTest(ViewTestCase): ...@@ -395,7 +393,6 @@ class HomeViewTest(ViewTestCase):
self.assertContains(response, 'whiteboard') self.assertContains(response, 'whiteboard')
self.assertContains(response, 'test_message') self.assertContains(response, 'test_message')
@OverrideSettings(ENABLE_WHITEBOARD=False)
def test_home_without_whiteboard(self): def test_home_without_whiteboard(self):
response = self.client.get(reverse('home')) response = self.client.get(reverse('home'))
self.assertNotContains(response, 'whiteboard') self.assertNotContains(response, 'whiteboard')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment