rest_framework 0.3.2 → 0.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/rest_framework/controller_mixins/models.rb +1 -0
- data/lib/rest_framework/filters.rb +5 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3c2cd61ac79fb24303888d0595f53816562ee4377703dca5e6e43842db66153d
|
|
4
|
+
data.tar.gz: 195627f1816895b657b1e796ffb81d70781c009aa8f7266cda8a7b28cde33bc2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f3dac5f9515f8797c3d2789ccdbc2e623bafa18124b81999c1959884f14449315c574c88ff7ecdfc8766b4816067b188634d381ee2e00b9e1eff91b71a347f6f
|
|
7
|
+
data.tar.gz: c883ab665f21b36d7d6838ef154eec4cd2072505fc1a21626e9b56f3a4287a5d85aa5fc090d4e780259ddfe77b4993db7e44157c7aac673138f5deb24a1c438b
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.3.
|
|
1
|
+
0.3.3
|
|
@@ -38,8 +38,8 @@ class RESTFramework::ModelOrderingFilter < RESTFramework::BaseFilter
|
|
|
38
38
|
def _get_ordering
|
|
39
39
|
return nil if @controller.class.ordering_query_param.blank?
|
|
40
40
|
ordering_fields = @controller.send(:get_ordering_fields)
|
|
41
|
-
|
|
42
41
|
order_string = @controller.params[@controller.class.ordering_query_param]
|
|
42
|
+
|
|
43
43
|
unless order_string.blank?
|
|
44
44
|
ordering = {}
|
|
45
45
|
order_string.split(',').each do |field|
|
|
@@ -63,9 +63,12 @@ class RESTFramework::ModelOrderingFilter < RESTFramework::BaseFilter
|
|
|
63
63
|
# Order data according to the request query parameters.
|
|
64
64
|
def get_filtered_data(data)
|
|
65
65
|
ordering = self._get_ordering
|
|
66
|
+
reorder = !@controller.send(:ordering_no_reorder)
|
|
67
|
+
|
|
66
68
|
if ordering && !ordering.empty?
|
|
67
|
-
return data.order
|
|
69
|
+
return data.send(reorder ? :reorder : :order, _get_ordering)
|
|
68
70
|
end
|
|
71
|
+
|
|
69
72
|
return data
|
|
70
73
|
end
|
|
71
74
|
end
|