Commit 37adb19f authored by Michal Čihař's avatar Michal Čihař

Simplify whiteboard imports

Signed-off-by: default avatarMichal Čihař <michal@cihar.com>
parent b2ef89dc
...@@ -30,8 +30,7 @@ from django.core.exceptions import ValidationError ...@@ -30,8 +30,7 @@ from django.core.exceptions import ValidationError
import shutil import shutil
import os import os
import git import git
from weblate.trans.models import Project, SubProject, Unit from weblate.trans.models import Project, SubProject, Unit, WhiteboardMessage
from weblate.trans.models import whiteboard as whiteboard_model
from weblate.trans.models.source import Source from weblate.trans.models.source import Source
from weblate import appsettings from weblate import appsettings
from weblate.trans.tests.test_util import get_test_file from weblate.trans.tests.test_util import get_test_file
...@@ -638,7 +637,7 @@ class WhiteboardMessageTest(TestCase): ...@@ -638,7 +637,7 @@ class WhiteboardMessageTest(TestCase):
Rather dumb test just to make sure there are no obvious parsing errors. Rather dumb test just to make sure there are no obvious parsing errors.
""" """
whiteboard_model.WhiteboardMessage() WhiteboardMessage()
class SourceTest(RepoTestCase): class SourceTest(RepoTestCase):
......
...@@ -35,7 +35,7 @@ from django.core import mail ...@@ -35,7 +35,7 @@ from django.core import mail
from PIL import Image from PIL import Image
from weblate import appsettings from weblate import appsettings
from weblate.trans.models import whiteboard as whiteboard_models from weblate.trans.models.whiteboard import WhiteboardMessage
from weblate.trans.models.changes import Change from weblate.trans.models.changes import Change
from weblate.trans.models.unitdata import Suggestion from weblate.trans.models.unitdata import Suggestion
from weblate.trans.tests.test_models import RepoTestCase from weblate.trans.tests.test_models import RepoTestCase
...@@ -1242,7 +1242,7 @@ class HomeViewTest(ViewTestCase): ...@@ -1242,7 +1242,7 @@ class HomeViewTest(ViewTestCase):
# appsettings.ENABLE_WHITEBOARD is just a constant that is being # appsettings.ENABLE_WHITEBOARD is just a constant that is being
# assigned during first import # assigned during first import
appsettings.ENABLE_WHITEBOARD = True appsettings.ENABLE_WHITEBOARD = True
msg = whiteboard_models.WhiteboardMessage(message='test_message') msg = WhiteboardMessage(message='test_message')
msg.save() msg.save()
response = self.client.get(reverse('home')) response = self.client.get(reverse('home'))
......
...@@ -30,9 +30,8 @@ import django.views.defaults ...@@ -30,9 +30,8 @@ import django.views.defaults
from weblate.trans.models import ( from weblate.trans.models import (
Project, SubProject, Translation, Check, Project, SubProject, Translation, Check,
Dictionary, Change, Unit Dictionary, Change, Unit, WhiteboardMessage
) )
from weblate.trans.models import whiteboard as whiteboard_models
from weblate.trans.requirements import get_versions, get_optional_versions from weblate.trans.requirements import get_versions, get_optional_versions
from weblate.lang.models import Language from weblate.lang.models import Language
from weblate.trans.forms import ( from weblate.trans.forms import (
...@@ -66,7 +65,7 @@ def home(request): ...@@ -66,7 +65,7 @@ def home(request):
) )
return redirect('password') return redirect('password')
wb_messages = whiteboard_models.WhiteboardMessage.objects.order_by( wb_messages = WhiteboardMessage.objects.order_by(
'message') 'message')
projects = Project.objects.all_acl(request.user) projects = Project.objects.all_acl(request.user)
......
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