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
cfc0ff8b
Commit
cfc0ff8b
authored
Oct 16, 2019
by
thorben_nehls
Browse files
Fixes for isort error during tox
parent
2db6d06c
Changes
2
Hide whitespace changes
Inline
Side-by-side
wagtailvideos/views/chooser.py
View file @
cfc0ff8b
from
django.core.paginator
import
Paginator
from
django.shortcuts
import
get_object_or_404
,
render
from
django.urls
import
reverse
from
django.core.paginator
import
Paginator
from
wagtail.admin.forms.search
import
SearchForm
from
wagtail.admin.modal_workflow
import
render_modal_workflow
...
...
@@ -8,7 +8,6 @@ from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model
from
wagtail.core.models
import
Collection
from
wagtail.images.views.chooser
import
get_chooser_js_data
from
wagtail.search
import
index
as
search_index
# from wagtail.utils.pagination import paginate
from
wagtailvideos.forms
import
get_video_form
from
wagtailvideos.models
import
Video
...
...
@@ -64,7 +63,6 @@ def chooser(request):
videos
=
videos
.
filter
(
tags__name
=
tag_name
)
# Pagination
# paginator, videos = paginate(request, videos, per_page=12)
paginator
=
Paginator
(
videos
,
per_page
=
12
)
page
=
paginator
.
get_page
(
request
.
GET
.
get
(
'p'
))
...
...
@@ -80,7 +78,6 @@ def chooser(request):
if
len
(
collections
)
<
2
:
collections
=
None
# paginator, videos = paginate(request, videos, per_page=12)
paginator
=
Paginator
(
videos
,
per_page
=
12
)
page
=
paginator
.
get_page
(
request
.
GET
.
get
(
'p'
))
...
...
@@ -132,7 +129,6 @@ def chooser_upload(request):
form
=
VideoForm
()
videos
=
Video
.
objects
.
order_by
(
'title'
)
# paginator, videos = paginate(request, videos, per_page=12)
paginator
=
Paginator
(
videos
,
per_page
=
12
)
page
=
paginator
.
get_page
(
request
.
GET
.
get
(
'p'
))
...
...
wagtailvideos/views/videos.py
View file @
cfc0ff8b
from
django.core.paginator
import
Paginator
from
django.http
import
HttpResponseNotAllowed
from
django.shortcuts
import
get_object_or_404
,
redirect
,
render
from
django.urls
import
reverse
from
django.utils.translation
import
ugettext
as
_
from
django.views.decorators.vary
import
vary_on_headers
from
django.core.paginator
import
Paginator
from
wagtail.admin
import
messages
from
wagtail.admin.forms.search
import
SearchForm
from
wagtail.admin.utils
import
PermissionPolicyChecker
,
popular_tags_for_model
from
wagtail.core.models
import
Collection
from
wagtail.search.backends
import
get_search_backends
# from wagtail.utils.pagination import paginate
from
wagtailvideos
import
ffmpeg
from
wagtailvideos.forms
import
VideoTranscodeAdminForm
,
get_video_form
...
...
@@ -47,7 +46,6 @@ def index(request):
except
(
ValueError
,
Collection
.
DoesNotExist
):
pass
# paginator, videos = paginate(request, videos)
paginator
=
Paginator
(
videos
,
per_page
=
25
)
page
=
paginator
.
get_page
(
request
.
GET
.
get
(
'p'
))
...
...
@@ -184,7 +182,6 @@ def add(request):
def
usage
(
request
,
image_id
):
image
=
get_object_or_404
(
Video
,
id
=
image_id
)
# paginator, used_by = paginate(request, image.get_usage())
paginator
=
Paginator
(
image
.
get_usage
(),
per_page
=
12
)
page
=
paginator
.
get_page
(
request
.
GET
.
get
(
'p'
))
...
...
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