Ubuntu Pastebin

Paste from dholbach at Fri, 11 Dec 2015 13:18:56 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
=== modified file 'developer_portal/blog/views.py'
--- developer_portal/blog/views.py	2015-10-30 16:44:57 +0000
+++ developer_portal/blog/views.py	2015-12-11 13:18:26 +0000
@@ -45,7 +45,9 @@
         return super(MultiLangEntryYear, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryYear, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryYear, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryYear, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryMonth(MultiLangMixin, EntryMonth):
     def get(self, request, *args, **kwargs):
@@ -53,7 +55,9 @@
         return super(MultiLangEntryMonth, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryMonth, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryMonth, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryMonth, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryWeek(MultiLangMixin, EntryWeek):
     def get(self, request, *args, **kwargs):
@@ -61,7 +65,9 @@
         return super(MultiLangEntryWeek, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryWeek, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryWeek self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryWeek, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryDay(MultiLangMixin, EntryDay):
     def get(self, request, *args, **kwargs):
@@ -69,7 +75,9 @@
         return super(MultiLangEntryDay, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryDay, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryDay, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryDay, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryToday(MultiLangMixin, EntryToday):
     def get(self, request, *args, **kwargs):
@@ -77,4 +85,6 @@
         return super(MultiLangEntryToday, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryToday, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryToday, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryToday, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
Download as text