Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE3
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
5
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
6ac4f944
authored
Jan 26, 2022
by
Karsa Zoltán István
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
delete table_pagination=False from view UserList
parent
32dfeb71
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
circle/dashboard/tables.py
+1
-0
circle/dashboard/views/user.py
+3
-4
No files found.
circle/dashboard/tables.py
View file @
6ac4f944
...
@@ -172,6 +172,7 @@ class UserListTable(Table):
...
@@ -172,6 +172,7 @@ class UserListTable(Table):
is_active
=
BooleanColumn
()
is_active
=
BooleanColumn
()
class
Meta
:
class
Meta
:
per_page
=
20
model
=
User
model
=
User
template
=
"django_tables2/with_pagination.html"
template
=
"django_tables2/with_pagination.html"
attrs
=
{
'class'
:
(
'table table-bordered table-striped table-hover'
)}
attrs
=
{
'class'
:
(
'table table-bordered table-striped table-hover'
)}
...
...
circle/dashboard/views/user.py
View file @
6ac4f944
...
@@ -43,7 +43,7 @@ from simplesshkey.models import UserKey
...
@@ -43,7 +43,7 @@ from simplesshkey.models import UserKey
from
braces.views
import
LoginRequiredMixin
,
PermissionRequiredMixin
from
braces.views
import
LoginRequiredMixin
,
PermissionRequiredMixin
from
django_tables2
import
SingleTableView
from
django_tables2
import
SingleTableView
,
LazyPaginator
from
vm.models
import
Instance
,
InstanceTemplate
from
vm.models
import
Instance
,
InstanceTemplate
...
@@ -537,12 +537,12 @@ class ConnectCommandCreate(LoginRequiredMixin, SuccessMessageMixin,
...
@@ -537,12 +537,12 @@ class ConnectCommandCreate(LoginRequiredMixin, SuccessMessageMixin,
return
kwargs
return
kwargs
class
UserList
(
LoginRequiredMixin
,
PermissionRequiredMixin
,
SingleTableView
):
class
UserList
(
LoginRequiredMixin
,
PermissionRequiredMixin
,
SingleTableView
):
template_name
=
"dashboard/user-list.html"
template_name
=
"dashboard/user-list.html"
permission_required
=
"auth.change_user"
permission_required
=
"auth.change_user"
model
=
User
model
=
User
table_class
=
UserListTable
table_class
=
UserListTable
table_pagination
=
True
def
get_context_data
(
self
,
*
args
,
**
kwargs
):
def
get_context_data
(
self
,
*
args
,
**
kwargs
):
context
=
super
(
UserList
,
self
)
.
get_context_data
(
*
args
,
**
kwargs
)
context
=
super
(
UserList
,
self
)
.
get_context_data
(
*
args
,
**
kwargs
)
...
@@ -552,7 +552,6 @@ class UserList(LoginRequiredMixin, PermissionRequiredMixin, SingleTableView):
...
@@ -552,7 +552,6 @@ class UserList(LoginRequiredMixin, PermissionRequiredMixin, SingleTableView):
def
get
(
self
,
*
args
,
**
kwargs
):
def
get
(
self
,
*
args
,
**
kwargs
):
self
.
search_form
=
UserListSearchForm
(
self
.
request
.
GET
)
self
.
search_form
=
UserListSearchForm
(
self
.
request
.
GET
)
self
.
search_form
.
full_clean
()
self
.
search_form
.
full_clean
()
if
self
.
request
.
is_ajax
():
if
self
.
request
.
is_ajax
():
users
=
[
users
=
[
{
'url'
:
reverse
(
"dashboard.views.profile"
,
args
=
[
i
.
username
]),
{
'url'
:
reverse
(
"dashboard.views.profile"
,
args
=
[
i
.
username
]),
...
...
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