Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
37adb19f
Commit
37adb19f
authored
May 08, 2014
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify whiteboard imports
Signed-off-by:
Michal Čihař
<
michal@cihar.com
>
parent
b2ef89dc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
weblate/trans/tests/test_models.py
weblate/trans/tests/test_models.py
+2
-3
weblate/trans/tests/test_views.py
weblate/trans/tests/test_views.py
+2
-2
weblate/trans/views/basic.py
weblate/trans/views/basic.py
+2
-3
No files found.
weblate/trans/tests/test_models.py
View file @
37adb19f
...
@@ -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
):
...
...
weblate/trans/tests/test_views.py
View file @
37adb19f
...
@@ -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'
))
...
...
weblate/trans/views/basic.py
View file @
37adb19f
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment