[chronojump-server] removed pagination from all pages for conflict
- From: Max Ros i Morejon <maxros src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump-server] removed pagination from all pages for conflict
- Date: Thu, 11 Jul 2019 08:37:34 +0000 (UTC)
commit ca29d0b415bc4024eaf3f5adced0676c654e51c7
Author: Max Ros i Morejon <mros33 gmail com>
Date: Thu Jul 11 10:37:24 2019 +0200
removed pagination from all pages for conflict
.../organizations/groups/group_players_list.html | 18 ++++++++++++------
.../templates/organizations/groups/groups_list.html | 7 +------
.../templates/organizations/gyms/gyms_list.html | 7 +------
.../templates/organizations/players/players_list.html | 7 +------
.../templates/results/results_list.html | 7 +------
.../templates/results/sprints_list.html | 7 +------
chronojumpserver-django/config/settings/base.py | 4 +---
7 files changed, 18 insertions(+), 39 deletions(-)
---
diff --git
a/chronojumpserver-django/chronojump_networks/templates/organizations/groups/group_players_list.html
b/chronojumpserver-django/chronojump_networks/templates/organizations/groups/group_players_list.html
index eec082e..371d4ba 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/groups/group_players_list.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/groups/group_players_list.html
@@ -93,6 +93,7 @@
/* Datatable for players in groups */
var table_players = $('#players').DataTable({
lengthChange: false,
+ "paging": false,
"ajax": {
"processing": true,
"url" : "{% url 'api_organizations:group_players_list' organization_id=user.organization.id
group_id=group.id %}",
@@ -240,12 +241,6 @@
"infoFiltered": "{% trans '(from a total of _MAX_ players)' %}",
"decimal": ",",
"thousands": ".",
- "paginate": {
- "first": '<i class="fa fa-fast-backward"></i>',
- "last": '<i class="fa fa-fast-forward"></i>',
- "next": '<i class="fa fa-forward"></i>',
- "previous": '<i class="fa fa-backward"></i>'
- },
"search": "{% trans 'Search:' %}"
}
});
@@ -424,6 +419,7 @@
/* Datatable for add players */
var add_players_table = $('#add_players').DataTable({
lengthChange: false,
+ "paging": false,
"ajax": {
"processing": true,
"url" : "{% url 'api_organizations:group_add_players_list' organization_id=user.organization.id
group_id=group.id %}",
@@ -470,6 +466,16 @@
e.preventDefault();
}
})
+ },
+ "language": {
+ "lengthMenu": "{% trans 'Showing _MENU_ players per page' %}",
+ "zeroRecords": "{% trans 'There are no remaining players to add in this group' %}",
+ "info": "{% trans 'Showing the players _START_ to _END_ of a total of _TOTAL_ players' %}",
+ "infoEmpty": "{% trans 'The search returns no results' %}",
+ "infoFiltered": "{% trans '(from a total of _MAX_ players)' %}",
+ "decimal": ",",
+ "thousands": ".",
+ "search": "{% trans 'Search:' %}"
}
});
diff --git a/chronojumpserver-django/chronojump_networks/templates/organizations/groups/groups_list.html
b/chronojumpserver-django/chronojump_networks/templates/organizations/groups/groups_list.html
index 2daf925..65dce21 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/groups/groups_list.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/groups/groups_list.html
@@ -58,6 +58,7 @@
/* Datatable for groups */
var table_groups = $('#groups').DataTable({
lengthChange: false,
+ "paging": false,
"ajax": {
"processing": true,
"url" : "{% url 'api_organizations:groups_list' organization_id=user.organization.id %}",
@@ -160,12 +161,6 @@
"infoFiltered": "{% trans '(from a total of _MAX_ groups)' %}",
"decimal": ",",
"thousands": ".",
- "paginate": {
- "first": '<i class="fa fa-fast-backward"></i>',
- "last": '<i class="fa fa-fast-forward"></i>',
- "next": '<i class="fa fa-forward"></i>',
- "previous": '<i class="fa fa-backward"></i>'
- },
"search": "{% trans 'Search:' %}"
}
});
diff --git a/chronojumpserver-django/chronojump_networks/templates/organizations/gyms/gyms_list.html
b/chronojumpserver-django/chronojump_networks/templates/organizations/gyms/gyms_list.html
index f3a0d94..f263478 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/gyms/gyms_list.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/gyms/gyms_list.html
@@ -55,6 +55,7 @@
/* Datatable for groups */
var table_gyms = $('#gyms').DataTable({
lengthChange: false,
+ "paging": false,
"ajax": {
"processing": true,
"url" : "{% url 'api_organizations:gyms_list' organization_id=user.organization.id %}",
@@ -97,12 +98,6 @@
"infoFiltered": "{% trans '(from a total of _MAX_ gyms)' %}",
"decimal": ",",
"thousands": ".",
- "paginate": {
- "first": '<i class="fa fa-fast-backward"></i>',
- "last": '<i class="fa fa-fast-forward"></i>',
- "next": '<i class="fa fa-forward"></i>',
- "previous": '<i class="fa fa-backward"></i>'
- },
"search": "{% trans 'Search:' %}"
}
});
diff --git a/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
b/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
index 1266560..973a6f1 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
@@ -60,6 +60,7 @@
/* Datatable for players in groups */
var table_players = $('#players').DataTable({
lengthChange: false,
+ "paging": false,
"ajax": {
"processing": true,
"url" : "{% url 'api_organizations:players_list' organization_id=user.organization.id %}",
@@ -177,12 +178,6 @@
"infoFiltered": "{% trans '(from a total of _MAX_ players)' %}",
"decimal": ",",
"thousands": ".",
- "paginate": {
- "first": '<i class="fa fa-fast-backward"></i>',
- "last": '<i class="fa fa-fast-forward"></i>',
- "next": '<i class="fa fa-forward"></i>',
- "previous": '<i class="fa fa-backward"></i>'
- },
"search": "{% trans 'Search:' %}"
}
});
diff --git a/chronojumpserver-django/chronojump_networks/templates/results/results_list.html
b/chronojumpserver-django/chronojump_networks/templates/results/results_list.html
index 4b71ee6..813a6a3 100644
--- a/chronojumpserver-django/chronojump_networks/templates/results/results_list.html
+++ b/chronojumpserver-django/chronojump_networks/templates/results/results_list.html
@@ -120,6 +120,7 @@
/* Datatable for players in groups */
var table_results = $('#results').DataTable({
lengthChange: false,
+ "paging": false,
"ajax": {
"processing": true,
"url" : "{% url 'api_results:results_list' %}",
@@ -457,12 +458,6 @@
"infoFiltered": "{% trans '_MAX_ results filtered' %}",
"decimal": ",",
"thousands": ".",
- "paginate": {
- "first": '<i class="fa fa-fast-backward"></i>',
- "last": '<i class="fa fa-fast-forward"></i>',
- "next": '<i class="fa fa-forward"></i>',
- "previous": '<i class="fa fa-backward"></i>'
- },
"search": "{% trans 'Search:' %}"
}
});
diff --git a/chronojumpserver-django/chronojump_networks/templates/results/sprints_list.html
b/chronojumpserver-django/chronojump_networks/templates/results/sprints_list.html
index 5b1a352..677a12d 100644
--- a/chronojumpserver-django/chronojump_networks/templates/results/sprints_list.html
+++ b/chronojumpserver-django/chronojump_networks/templates/results/sprints_list.html
@@ -120,6 +120,7 @@
/* Datatable for players in groups */
var table_results = $('#sprints').DataTable({
lengthChange: false,
+ "paging": false,
"ajax": {
"processing": true,
"url" : "{% url 'api_results:sprints_list' %}",
@@ -400,12 +401,6 @@
"infoFiltered": "{% trans '_MAX_ results filtered' %}",
"decimal": ",",
"thousands": ".",
- "paginate": {
- "first": '<i class="fa fa-fast-backward"></i>',
- "last": '<i class="fa fa-fast-forward"></i>',
- "next": '<i class="fa fa-forward"></i>',
- "previous": '<i class="fa fa-backward"></i>'
- },
"search": "{% trans 'Search:' %}"
}
});
diff --git a/chronojumpserver-django/config/settings/base.py b/chronojumpserver-django/config/settings/base.py
index b323f00..33ff948 100644
--- a/chronojumpserver-django/config/settings/base.py
+++ b/chronojumpserver-django/config/settings/base.py
@@ -236,7 +236,5 @@ CSRF_USE_SESSIONS=True # Store the CSRF in Session is better than in a cookie
REST_FRAMEWORK = {
'DEFAULT_PERMISSION_CLASSES': (
'rest_framework.permissions.IsAdminUser',
- ),
- 'DEFAULT_PAGINATION_CLASS': None,
- 'PAGE_SIZE': None
+ )
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]