Remove order parameter admin view#2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rtibbles merged 3 commits into from
Dec 9, 2020
Merged

Remove order parameter admin view #2653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
507b56a
remove 'ordering' specific code on the backend and set order to null …
marcellamaki Dec 9, 2020
2c035e9
remove 'ordering' specific code on the backend as it is not receiving…
marcellamaki Dec 9, 2020
1d2cf70
remove ordering param reference from pagination queryset
marcellamaki Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion contentcuration/contentcuration/frontend/administration/vuex/channelAdmin/actions.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import client from 'shared/client';
export function loadChannels({ commit }, params) {
params.deleted = Boolean(params.deleted) && params.deleted.toString() === 'true';
params.page_size = params.page_size || 25;
params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';

return client.get(window.Urls.admin_channels_list(), { params }).then(response => {
commit('SET_PAGE_DATA', response.data);
Expand Down
1 change: 0 additions & 1 deletion contentcuration/contentcuration/frontend/administration/vuex/userAdmin/actions.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ export function loadUserDetails(context, id) {

export function loadUsers({ commit }, params) {
params.page_size = params.page_size || 100;
params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';
return client.get(window.Urls.admin_users_list(), { params }).then(response => {
response.data.results = map(response.data.results, u => {
return { ...u, id: u.id.toString() };
Expand Down
5 changes: 1 addition & 4 deletions contentcuration/contentcuration/utils/pagination.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,7 @@ def get_order_queryset(request, queryset, field_map):
"""
order = request.GET.get("sortBy", "")
if not order:
# frontend sends sometimes an 'ordering' parameter instead of sortBy (unknown reason)
# this 'ordering' param is sometimes null and others undefined
order = request.GET.get("ordering", "undefined")
order = "undefined" if order == "null" else order
order = "undefined"

if order in field_map and type(field_map[order]) is str:
order = field_map[order]
Expand Down
12 changes: 0 additions & 12 deletions contentcuration/contentcuration/viewsets/channel.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
from rest_framework import serializers
from rest_framework.decorators import detail_route
from rest_framework.exceptions import ValidationError
from rest_framework.filters import OrderingFilter
from rest_framework.permissions import AllowAny
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -568,7 +567,6 @@ class AdminChannelViewSet(ChannelViewSet):
filter_class = AdminChannelFilter
filter_backends = (
DjangoFilterBackend,
OrderingFilter,
)
field_map = {
"published": "main_tree__published",
Expand All@@ -591,16 +589,6 @@ class AdminChannelViewSet(ChannelViewSet):
"demo_server_url",
)
values = base_values
ordering_fields = (
"name",
"id",
"modified",
"created",
"primary_token",
"source_url",
"demo_server_url",
)
ordering = ("name",)

def paginate_queryset(self, queryset):
order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down
13 changes: 0 additions & 13 deletions contentcuration/contentcuration/viewsets/user.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
from django_filters.rest_framework import CharFilter
from django_filters.rest_framework import DjangoFilterBackend
from django_filters.rest_framework import FilterSet
from rest_framework.filters import OrderingFilter
from rest_framework.pagination import PageNumberPagination
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -311,7 +310,6 @@ class AdminUserViewSet(UserViewSet):
filter_class = AdminUserFilter
filter_backends = (
DjangoFilterBackend,
OrderingFilter,
)
base_values = (
"id",
Expand All@@ -326,17 +324,6 @@ class AdminUserViewSet(UserViewSet):
"is_active",
)
values = base_values
ordering_fields = (
"name",
"last_name",
"email",
"disk_space",
"edit_count",
"view_count",
"date_joined",
"last_login",
)
ordering = ("last_name",)

def paginate_queryset(self, queryset):
order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove order parameter admin view#2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rtibbles
merged 3 commits into

from

Dec 9, 2020
 Merged


Remove order parameter admin view
#2653
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
507b56a

remove 'ordering' specific code on the backend and set order to null …


marcellamaki Dec 9, 2020
2c035e9

remove 'ordering' specific code on the backend as it is not receiving…


marcellamaki Dec 9, 2020
1d2cf70

remove ordering param reference from pagination queryset


marcellamaki Dec 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/channelAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import client from 'shared/client';
export function loadChannels({ commit }, params) {
 params.deleted = Boolean(params.deleted) && params.deleted.toString() === 'true';
 params.page_size = params.page_size || 25;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';

 return client.get(window.Urls.admin_channels_list(), { params }).then(response => {
 commit('SET_PAGE_DATA', response.data);
Expand Down

1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/userAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ export function loadUserDetails(context, id) {

export function loadUsers({ commit }, params) {
 params.page_size = params.page_size || 100;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';
 return client.get(window.Urls.admin_users_list(), { params }).then(response => {
 response.data.results = map(response.data.results, u => {
 return { ...u, id: u.id.toString() };
Expand Down

5 changes: 1 addition & 4 deletions
contentcuration/contentcuration/utils/pagination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,7 @@ def get_order_queryset(request, queryset, field_map):
 """
 order = request.GET.get("sortBy", "")
 if not order:
 # frontend sends sometimes an 'ordering' parameter instead of sortBy (unknown reason)
 # this 'ordering' param is sometimes null and others undefined
 order = request.GET.get("ordering", "undefined")
 order = "undefined" if order == "null" else order
 order = "undefined"

 if order in field_map and type(field_map[order]) is str:
 order = field_map[order]
Expand Down

12 changes: 0 additions & 12 deletions
contentcuration/contentcuration/viewsets/channel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
from rest_framework import serializers
from rest_framework.decorators import detail_route
from rest_framework.exceptions import ValidationError
from rest_framework.filters import OrderingFilter
from rest_framework.permissions import AllowAny
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -568,7 +567,6 @@ class AdminChannelViewSet(ChannelViewSet):
 filter_class = AdminChannelFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 field_map = {
 "published": "main_tree__published",
Expand All@@ -591,16 +589,6 @@ class AdminChannelViewSet(ChannelViewSet):
 "demo_server_url",
 )
 values = base_values
 ordering_fields = (
 "name",
 "id",
 "modified",
 "created",
 "primary_token",
 "source_url",
 "demo_server_url",
 )
 ordering = ("name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

13 changes: 0 additions & 13 deletions
contentcuration/contentcuration/viewsets/user.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
from django_filters.rest_framework import CharFilter
from django_filters.rest_framework import DjangoFilterBackend
from django_filters.rest_framework import FilterSet
from rest_framework.filters import OrderingFilter
from rest_framework.pagination import PageNumberPagination
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -311,7 +310,6 @@ class AdminUserViewSet(UserViewSet):
 filter_class = AdminUserFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 base_values = (
 "id",
Expand All@@ -326,17 +324,6 @@ class AdminUserViewSet(UserViewSet):
 "is_active",
 )
 values = base_values
 ordering_fields = (
 "name",
 "last_name",
 "email",
 "disk_space",
 "edit_count",
 "view_count",
 "date_joined",
 "last_login",
 )
 ordering = ("last_name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove order parameter admin view#2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rtibbles
merged 3 commits into

from

Dec 9, 2020
 Merged


Remove order parameter admin view
#2653
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
507b56a

remove 'ordering' specific code on the backend and set order to null …


marcellamaki Dec 9, 2020
2c035e9

remove 'ordering' specific code on the backend as it is not receiving…


marcellamaki Dec 9, 2020
1d2cf70

remove ordering param reference from pagination queryset


marcellamaki Dec 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/channelAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import client from 'shared/client';
export function loadChannels({ commit }, params) {
 params.deleted = Boolean(params.deleted) && params.deleted.toString() === 'true';
 params.page_size = params.page_size || 25;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';

 return client.get(window.Urls.admin_channels_list(), { params }).then(response => {
 commit('SET_PAGE_DATA', response.data);
Expand Down

1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/userAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ export function loadUserDetails(context, id) {

export function loadUsers({ commit }, params) {
 params.page_size = params.page_size || 100;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';
 return client.get(window.Urls.admin_users_list(), { params }).then(response => {
 response.data.results = map(response.data.results, u => {
 return { ...u, id: u.id.toString() };
Expand Down

5 changes: 1 addition & 4 deletions
contentcuration/contentcuration/utils/pagination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,7 @@ def get_order_queryset(request, queryset, field_map):
 """
 order = request.GET.get("sortBy", "")
 if not order:
 # frontend sends sometimes an 'ordering' parameter instead of sortBy (unknown reason)
 # this 'ordering' param is sometimes null and others undefined
 order = request.GET.get("ordering", "undefined")
 order = "undefined" if order == "null" else order
 order = "undefined"

 if order in field_map and type(field_map[order]) is str:
 order = field_map[order]
Expand Down

12 changes: 0 additions & 12 deletions
contentcuration/contentcuration/viewsets/channel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
from rest_framework import serializers
from rest_framework.decorators import detail_route
from rest_framework.exceptions import ValidationError
from rest_framework.filters import OrderingFilter
from rest_framework.permissions import AllowAny
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -568,7 +567,6 @@ class AdminChannelViewSet(ChannelViewSet):
 filter_class = AdminChannelFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 field_map = {
 "published": "main_tree__published",
Expand All@@ -591,16 +589,6 @@ class AdminChannelViewSet(ChannelViewSet):
 "demo_server_url",
 )
 values = base_values
 ordering_fields = (
 "name",
 "id",
 "modified",
 "created",
 "primary_token",
 "source_url",
 "demo_server_url",
 )
 ordering = ("name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

13 changes: 0 additions & 13 deletions
contentcuration/contentcuration/viewsets/user.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
from django_filters.rest_framework import CharFilter
from django_filters.rest_framework import DjangoFilterBackend
from django_filters.rest_framework import FilterSet
from rest_framework.filters import OrderingFilter
from rest_framework.pagination import PageNumberPagination
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -311,7 +310,6 @@ class AdminUserViewSet(UserViewSet):
 filter_class = AdminUserFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 base_values = (
 "id",
Expand All@@ -326,17 +324,6 @@ class AdminUserViewSet(UserViewSet):
 "is_active",
 )
 values = base_values
 ordering_fields = (
 "name",
 "last_name",
 "email",
 "disk_space",
 "edit_count",
 "view_count",
 "date_joined",
 "last_login",
 )
 ordering = ("last_name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove order parameter admin view#2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rtibbles
merged 3 commits into

from

Dec 9, 2020
 Merged


Remove order parameter admin view
#2653
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
507b56a

remove 'ordering' specific code on the backend and set order to null …


marcellamaki Dec 9, 2020
2c035e9

remove 'ordering' specific code on the backend as it is not receiving…


marcellamaki Dec 9, 2020
1d2cf70

remove ordering param reference from pagination queryset


marcellamaki Dec 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/channelAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import client from 'shared/client';
export function loadChannels({ commit }, params) {
 params.deleted = Boolean(params.deleted) && params.deleted.toString() === 'true';
 params.page_size = params.page_size || 25;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';

 return client.get(window.Urls.admin_channels_list(), { params }).then(response => {
 commit('SET_PAGE_DATA', response.data);
Expand Down

1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/userAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ export function loadUserDetails(context, id) {

export function loadUsers({ commit }, params) {
 params.page_size = params.page_size || 100;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';
 return client.get(window.Urls.admin_users_list(), { params }).then(response => {
 response.data.results = map(response.data.results, u => {
 return { ...u, id: u.id.toString() };
Expand Down

5 changes: 1 addition & 4 deletions
contentcuration/contentcuration/utils/pagination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,7 @@ def get_order_queryset(request, queryset, field_map):
 """
 order = request.GET.get("sortBy", "")
 if not order:
 # frontend sends sometimes an 'ordering' parameter instead of sortBy (unknown reason)
 # this 'ordering' param is sometimes null and others undefined
 order = request.GET.get("ordering", "undefined")
 order = "undefined" if order == "null" else order
 order = "undefined"

 if order in field_map and type(field_map[order]) is str:
 order = field_map[order]
Expand Down

12 changes: 0 additions & 12 deletions
contentcuration/contentcuration/viewsets/channel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
from rest_framework import serializers
from rest_framework.decorators import detail_route
from rest_framework.exceptions import ValidationError
from rest_framework.filters import OrderingFilter
from rest_framework.permissions import AllowAny
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -568,7 +567,6 @@ class AdminChannelViewSet(ChannelViewSet):
 filter_class = AdminChannelFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 field_map = {
 "published": "main_tree__published",
Expand All@@ -591,16 +589,6 @@ class AdminChannelViewSet(ChannelViewSet):
 "demo_server_url",
 )
 values = base_values
 ordering_fields = (
 "name",
 "id",
 "modified",
 "created",
 "primary_token",
 "source_url",
 "demo_server_url",
 )
 ordering = ("name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

13 changes: 0 additions & 13 deletions
contentcuration/contentcuration/viewsets/user.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
from django_filters.rest_framework import CharFilter
from django_filters.rest_framework import DjangoFilterBackend
from django_filters.rest_framework import FilterSet
from rest_framework.filters import OrderingFilter
from rest_framework.pagination import PageNumberPagination
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -311,7 +310,6 @@ class AdminUserViewSet(UserViewSet):
 filter_class = AdminUserFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 base_values = (
 "id",
Expand All@@ -326,17 +324,6 @@ class AdminUserViewSet(UserViewSet):
 "is_active",
 )
 values = base_values
 ordering_fields = (
 "name",
 "last_name",
 "email",
 "disk_space",
 "edit_count",
 "view_count",
 "date_joined",
 "last_login",
 )
 ordering = ("last_name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Remove order parameter admin view#2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rtibbles
merged 3 commits into

from

Dec 9, 2020
 Merged


Remove order parameter admin view
#2653
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
507b56a

remove 'ordering' specific code on the backend and set order to null …


marcellamaki Dec 9, 2020
2c035e9

remove 'ordering' specific code on the backend as it is not receiving…


marcellamaki Dec 9, 2020
1d2cf70

remove ordering param reference from pagination queryset


marcellamaki Dec 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/channelAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import client from 'shared/client';
export function loadChannels({ commit }, params) {
 params.deleted = Boolean(params.deleted) && params.deleted.toString() === 'true';
 params.page_size = params.page_size || 25;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';

 return client.get(window.Urls.admin_channels_list(), { params }).then(response => {
 commit('SET_PAGE_DATA', response.data);
Expand Down

1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/userAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ export function loadUserDetails(context, id) {

export function loadUsers({ commit }, params) {
 params.page_size = params.page_size || 100;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';
 return client.get(window.Urls.admin_users_list(), { params }).then(response => {
 response.data.results = map(response.data.results, u => {
 return { ...u, id: u.id.toString() };
Expand Down

5 changes: 1 addition & 4 deletions
contentcuration/contentcuration/utils/pagination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,7 @@ def get_order_queryset(request, queryset, field_map):
 """
 order = request.GET.get("sortBy", "")
 if not order:
 # frontend sends sometimes an 'ordering' parameter instead of sortBy (unknown reason)
 # this 'ordering' param is sometimes null and others undefined
 order = request.GET.get("ordering", "undefined")
 order = "undefined" if order == "null" else order
 order = "undefined"

 if order in field_map and type(field_map[order]) is str:
 order = field_map[order]
Expand Down

12 changes: 0 additions & 12 deletions
contentcuration/contentcuration/viewsets/channel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
from rest_framework import serializers
from rest_framework.decorators import detail_route
from rest_framework.exceptions import ValidationError
from rest_framework.filters import OrderingFilter
from rest_framework.permissions import AllowAny
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -568,7 +567,6 @@ class AdminChannelViewSet(ChannelViewSet):
 filter_class = AdminChannelFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 field_map = {
 "published": "main_tree__published",
Expand All@@ -591,16 +589,6 @@ class AdminChannelViewSet(ChannelViewSet):
 "demo_server_url",
 )
 values = base_values
 ordering_fields = (
 "name",
 "id",
 "modified",
 "created",
 "primary_token",
 "source_url",
 "demo_server_url",
 )
 ordering = ("name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

13 changes: 0 additions & 13 deletions
contentcuration/contentcuration/viewsets/user.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
from django_filters.rest_framework import CharFilter
from django_filters.rest_framework import DjangoFilterBackend
from django_filters.rest_framework import FilterSet
from rest_framework.filters import OrderingFilter
from rest_framework.pagination import PageNumberPagination
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -311,7 +310,6 @@ class AdminUserViewSet(UserViewSet):
 filter_class = AdminUserFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 base_values = (
 "id",
Expand All@@ -326,17 +324,6 @@ class AdminUserViewSet(UserViewSet):
 "is_active",
 )
 values = base_values
 ordering_fields = (
 "name",
 "last_name",
 "email",
 "disk_space",
 "edit_count",
 "view_count",
 "date_joined",
 "last_login",
 )
 ordering = ("last_name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove order parameter admin view#2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rtibbles
merged 3 commits into

from

Dec 9, 2020
 Merged


Remove order parameter admin view
#2653
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
507b56a

remove 'ordering' specific code on the backend and set order to null …


marcellamaki Dec 9, 2020
2c035e9

remove 'ordering' specific code on the backend as it is not receiving…


marcellamaki Dec 9, 2020
1d2cf70

remove ordering param reference from pagination queryset


marcellamaki Dec 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/channelAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import client from 'shared/client';
export function loadChannels({ commit }, params) {
 params.deleted = Boolean(params.deleted) && params.deleted.toString() === 'true';
 params.page_size = params.page_size || 25;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';

 return client.get(window.Urls.admin_channels_list(), { params }).then(response => {
 commit('SET_PAGE_DATA', response.data);
Expand Down

1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/userAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ export function loadUserDetails(context, id) {

export function loadUsers({ commit }, params) {
 params.page_size = params.page_size || 100;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';
 return client.get(window.Urls.admin_users_list(), { params }).then(response => {
 response.data.results = map(response.data.results, u => {
 return { ...u, id: u.id.toString() };
Expand Down

5 changes: 1 addition & 4 deletions
contentcuration/contentcuration/utils/pagination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,7 @@ def get_order_queryset(request, queryset, field_map):
 """
 order = request.GET.get("sortBy", "")
 if not order:
 # frontend sends sometimes an 'ordering' parameter instead of sortBy (unknown reason)
 # this 'ordering' param is sometimes null and others undefined
 order = request.GET.get("ordering", "undefined")
 order = "undefined" if order == "null" else order
 order = "undefined"

 if order in field_map and type(field_map[order]) is str:
 order = field_map[order]
Expand Down

12 changes: 0 additions & 12 deletions
contentcuration/contentcuration/viewsets/channel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
from rest_framework import serializers
from rest_framework.decorators import detail_route
from rest_framework.exceptions import ValidationError
from rest_framework.filters import OrderingFilter
from rest_framework.permissions import AllowAny
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -568,7 +567,6 @@ class AdminChannelViewSet(ChannelViewSet):
 filter_class = AdminChannelFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 field_map = {
 "published": "main_tree__published",
Expand All@@ -591,16 +589,6 @@ class AdminChannelViewSet(ChannelViewSet):
 "demo_server_url",
 )
 values = base_values
 ordering_fields = (
 "name",
 "id",
 "modified",
 "created",
 "primary_token",
 "source_url",
 "demo_server_url",
 )
 ordering = ("name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

13 changes: 0 additions & 13 deletions
contentcuration/contentcuration/viewsets/user.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
from django_filters.rest_framework import CharFilter
from django_filters.rest_framework import DjangoFilterBackend
from django_filters.rest_framework import FilterSet
from rest_framework.filters import OrderingFilter
from rest_framework.pagination import PageNumberPagination
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -311,7 +310,6 @@ class AdminUserViewSet(UserViewSet):
 filter_class = AdminUserFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 base_values = (
 "id",
Expand All@@ -326,17 +324,6 @@ class AdminUserViewSet(UserViewSet):
 "is_active",
 )
 values = base_values
 ordering_fields = (
 "name",
 "last_name",
 "email",
 "disk_space",
 "edit_count",
 "view_count",
 "date_joined",
 "last_login",
 )
 ordering = ("last_name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove order parameter admin view#2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rtibbles
merged 3 commits into

from

Dec 9, 2020
 Merged


Remove order parameter admin view
#2653
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
507b56a

remove 'ordering' specific code on the backend and set order to null …


marcellamaki Dec 9, 2020
2c035e9

remove 'ordering' specific code on the backend as it is not receiving…


marcellamaki Dec 9, 2020
1d2cf70

remove ordering param reference from pagination queryset


marcellamaki Dec 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/channelAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import client from 'shared/client';
export function loadChannels({ commit }, params) {
 params.deleted = Boolean(params.deleted) && params.deleted.toString() === 'true';
 params.page_size = params.page_size || 25;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';

 return client.get(window.Urls.admin_channels_list(), { params }).then(response => {
 commit('SET_PAGE_DATA', response.data);
Expand Down

1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/userAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ export function loadUserDetails(context, id) {

export function loadUsers({ commit }, params) {
 params.page_size = params.page_size || 100;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';
 return client.get(window.Urls.admin_users_list(), { params }).then(response => {
 response.data.results = map(response.data.results, u => {
 return { ...u, id: u.id.toString() };
Expand Down

5 changes: 1 addition & 4 deletions
contentcuration/contentcuration/utils/pagination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,7 @@ def get_order_queryset(request, queryset, field_map):
 """
 order = request.GET.get("sortBy", "")
 if not order:
 # frontend sends sometimes an 'ordering' parameter instead of sortBy (unknown reason)
 # this 'ordering' param is sometimes null and others undefined
 order = request.GET.get("ordering", "undefined")
 order = "undefined" if order == "null" else order
 order = "undefined"

 if order in field_map and type(field_map[order]) is str:
 order = field_map[order]
Expand Down

12 changes: 0 additions & 12 deletions
contentcuration/contentcuration/viewsets/channel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
from rest_framework import serializers
from rest_framework.decorators import detail_route
from rest_framework.exceptions import ValidationError
from rest_framework.filters import OrderingFilter
from rest_framework.permissions import AllowAny
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -568,7 +567,6 @@ class AdminChannelViewSet(ChannelViewSet):
 filter_class = AdminChannelFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 field_map = {
 "published": "main_tree__published",
Expand All@@ -591,16 +589,6 @@ class AdminChannelViewSet(ChannelViewSet):
 "demo_server_url",
 )
 values = base_values
 ordering_fields = (
 "name",
 "id",
 "modified",
 "created",
 "primary_token",
 "source_url",
 "demo_server_url",
 )
 ordering = ("name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

13 changes: 0 additions & 13 deletions
contentcuration/contentcuration/viewsets/user.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
from django_filters.rest_framework import CharFilter
from django_filters.rest_framework import DjangoFilterBackend
from django_filters.rest_framework import FilterSet
from rest_framework.filters import OrderingFilter
from rest_framework.pagination import PageNumberPagination
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -311,7 +310,6 @@ class AdminUserViewSet(UserViewSet):
 filter_class = AdminUserFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 base_values = (
 "id",
Expand All@@ -326,17 +324,6 @@ class AdminUserViewSet(UserViewSet):
 "is_active",
 )
 values = base_values
 ordering_fields = (
 "name",
 "last_name",
 "email",
 "disk_space",
 "edit_count",
 "view_count",
 "date_joined",
 "last_login",
 )
 ordering = ("last_name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Remove order parameter admin view#2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rtibbles
merged 3 commits into

from

Dec 9, 2020
 Merged


Remove order parameter admin view
#2653
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
507b56a

remove 'ordering' specific code on the backend and set order to null …


marcellamaki Dec 9, 2020
2c035e9

remove 'ordering' specific code on the backend as it is not receiving…


marcellamaki Dec 9, 2020
1d2cf70

remove ordering param reference from pagination queryset


marcellamaki Dec 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/channelAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import client from 'shared/client';
export function loadChannels({ commit }, params) {
 params.deleted = Boolean(params.deleted) && params.deleted.toString() === 'true';
 params.page_size = params.page_size || 25;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';

 return client.get(window.Urls.admin_channels_list(), { params }).then(response => {
 commit('SET_PAGE_DATA', response.data);
Expand Down

1 change: 0 additions & 1 deletion
contentcuration/contentcuration/frontend/administration/vuex/userAdmin/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ export function loadUserDetails(context, id) {

export function loadUsers({ commit }, params) {
 params.page_size = params.page_size || 100;
 params.ordering = `${params.descending ? '-' : ''}${params.sortBy}` || '';
 return client.get(window.Urls.admin_users_list(), { params }).then(response => {
 response.data.results = map(response.data.results, u => {
 return { ...u, id: u.id.toString() };
Expand Down

5 changes: 1 addition & 4 deletions
contentcuration/contentcuration/utils/pagination.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,7 @@ def get_order_queryset(request, queryset, field_map):
 """
 order = request.GET.get("sortBy", "")
 if not order:
 # frontend sends sometimes an 'ordering' parameter instead of sortBy (unknown reason)
 # this 'ordering' param is sometimes null and others undefined
 order = request.GET.get("ordering", "undefined")
 order = "undefined" if order == "null" else order
 order = "undefined"

 if order in field_map and type(field_map[order]) is str:
 order = field_map[order]
Expand Down

12 changes: 0 additions & 12 deletions
contentcuration/contentcuration/viewsets/channel.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
from rest_framework import serializers
from rest_framework.decorators import detail_route
from rest_framework.exceptions import ValidationError
from rest_framework.filters import OrderingFilter
from rest_framework.permissions import AllowAny
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -568,7 +567,6 @@ class AdminChannelViewSet(ChannelViewSet):
 filter_class = AdminChannelFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 field_map = {
 "published": "main_tree__published",
Expand All@@ -591,16 +589,6 @@ class AdminChannelViewSet(ChannelViewSet):
 "demo_server_url",
 )
 values = base_values
 ordering_fields = (
 "name",
 "id",
 "modified",
 "created",
 "primary_token",
 "source_url",
 "demo_server_url",
 )
 ordering = ("name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down

13 changes: 0 additions & 13 deletions
contentcuration/contentcuration/viewsets/user.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
from django_filters.rest_framework import CharFilter
from django_filters.rest_framework import DjangoFilterBackend
from django_filters.rest_framework import FilterSet
from rest_framework.filters import OrderingFilter
from rest_framework.pagination import PageNumberPagination
from rest_framework.permissions import IsAdminUser
from rest_framework.permissions import IsAuthenticated
Expand DownExpand Up@@ -311,7 +310,6 @@ class AdminUserViewSet(UserViewSet):
 filter_class = AdminUserFilter
 filter_backends = (
 DjangoFilterBackend,
 OrderingFilter,
 )
 base_values = (
 "id",
Expand All@@ -326,17 +324,6 @@ class AdminUserViewSet(UserViewSet):
 "is_active",
 )
 values = base_values
 ordering_fields = (
 "name",
 "last_name",
 "email",
 "disk_space",
 "edit_count",
 "view_count",
 "date_joined",
 "last_login",
 )
 ordering = ("last_name",)

 def paginate_queryset(self, queryset):
 order, queryset = get_order_queryset(self.request, queryset, self.field_map)
Expand Down