Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Websites UFRPE
Wagtail Videos
Commits
f6f07d65
Unverified
Commit
f6f07d65
authored
Aug 17, 2020
by
seb-b
Committed by
GitHub
Aug 17, 2020
Browse files
Merge pull request #43 from Delph/master
Fixed version check for Wagtail 2.10
parents
e0d0964a
36c225b3
Changes
4
Hide whitespace changes
Inline
Side-by-side
wagtailvideos/models.py
View file @
f6f07d65
...
@@ -29,7 +29,8 @@ from wagtail.search.queryset import SearchableQuerySetMixin
...
@@ -29,7 +29,8 @@ from wagtail.search.queryset import SearchableQuerySetMixin
from
wagtailvideos
import
ffmpeg
from
wagtailvideos
import
ffmpeg
if
wagtail
.
__version__
>=
'2.7'
:
from
distutils.version
import
LooseVersion
if
LooseVersion
(
wagtail
.
__version__
)
>=
LooseVersion
(
'2.7'
):
from
wagtail.admin.models
import
get_object_usage
from
wagtail.admin.models
import
get_object_usage
else
:
else
:
from
wagtail.admin.utils
import
get_object_usage
from
wagtail.admin.utils
import
get_object_usage
...
...
wagtailvideos/views/chooser.py
View file @
f6f07d65
...
@@ -12,7 +12,8 @@ from wagtailvideos.forms import get_video_form
...
@@ -12,7 +12,8 @@ from wagtailvideos.forms import get_video_form
from
wagtailvideos.models
import
Video
from
wagtailvideos.models
import
Video
from
wagtailvideos.permissions
import
permission_policy
from
wagtailvideos.permissions
import
permission_policy
if
wagtail
.
__version__
>=
'2.7'
:
from
distutils.version
import
LooseVersion
if
LooseVersion
(
wagtail
.
__version__
)
>=
LooseVersion
(
'2.7'
):
from
wagtail.admin.models
import
popular_tags_for_model
from
wagtail.admin.models
import
popular_tags_for_model
from
wagtail.admin.auth
import
PermissionPolicyChecker
from
wagtail.admin.auth
import
PermissionPolicyChecker
else
:
else
:
...
...
wagtailvideos/views/multiple.py
View file @
f6f07d65
...
@@ -11,7 +11,8 @@ from wagtailvideos.forms import get_video_form
...
@@ -11,7 +11,8 @@ from wagtailvideos.forms import get_video_form
from
wagtailvideos.models
import
Video
from
wagtailvideos.models
import
Video
from
wagtailvideos.permissions
import
permission_policy
from
wagtailvideos.permissions
import
permission_policy
if
wagtail
.
__version__
>=
'2.7'
:
from
distutils.version
import
LooseVersion
if
LooseVersion
(
wagtail
.
__version__
)
>=
LooseVersion
(
'2.7'
):
from
wagtail.admin.auth
import
PermissionPolicyChecker
from
wagtail.admin.auth
import
PermissionPolicyChecker
else
:
else
:
from
wagtail.admin.utils
import
PermissionPolicyChecker
from
wagtail.admin.utils
import
PermissionPolicyChecker
...
...
wagtailvideos/views/videos.py
View file @
f6f07d65
...
@@ -15,7 +15,8 @@ from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form
...
@@ -15,7 +15,8 @@ from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form
from
wagtailvideos.models
import
Video
from
wagtailvideos.models
import
Video
from
wagtailvideos.permissions
import
permission_policy
from
wagtailvideos.permissions
import
permission_policy
if
wagtail
.
__version__
>=
'2.7'
:
from
distutils.version
import
LooseVersion
if
LooseVersion
(
wagtail
.
__version__
)
>=
LooseVersion
(
'2.7'
):
from
wagtail.admin.models
import
popular_tags_for_model
from
wagtail.admin.models
import
popular_tags_for_model
from
wagtail.admin.auth
import
PermissionPolicyChecker
from
wagtail.admin.auth
import
PermissionPolicyChecker
else
:
else
:
...
...
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