[Catalyst-commits] r14466 - in CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk: . lib/CatalystX/CRUD/Model lib/CatalystX/CRUD/Object

[karpet at dev.catalyst.perl.org]

Author: karpet
Date: 2013-10-07 17:24:08 +0000 (Mon, 07 Oct 2013)
New Revision: 14466

Modified:
   CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes
   CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm
   CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm
Log:
release 0.29

Modified: CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes	2013-09-09 14:05:11 UTC (rev 14465)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes	2013-10-07 17:24:08 UTC (rev 14466)
@@ -97,3 +97,6 @@
 
 0.28    22 July 2013
         * do not attempt to sort related objects till column name api can be figured out r14454
+
+0.29    07 Oct 2013
+        * re-enable sort of related objects as long as they are o2m not m2m

Modified: CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm	2013-09-09 14:05:11 UTC (rev 14465)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm	2013-10-07 17:24:08 UTC (rev 14466)
@@ -8,7 +8,7 @@
 use Carp;
 use Data::Dump qw( dump );
 
-our $VERSION = '0.28';
+our $VERSION = '0.29';
 
 __PACKAGE__->mk_ro_accessors(
     qw( name manager treat_like_int load_with related_load_with ));
@@ -304,7 +304,10 @@
     if ( @{ $query->{query} } ) {
         @arg = ( query => $query->{query} );
     }
-    for (qw( limit offset )) {
+    for (qw( limit offset sort_by )) {
+        if ( $self->context->req->params->{'cxc-m2m'} and $_ eq 'sort_by' ) {
+            next;
+        }
         if ( exists $query->{$_} and length $query->{$_} ) {
             push( @arg, $_ => $query->{$_} );
         }

Modified: CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm	2013-09-09 14:05:11 UTC (rev 14465)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm	2013-10-07 17:24:08 UTC (rev 14466)
@@ -7,7 +7,7 @@
 use Rose::DB::Object::Helpers qw( column_values_as_json );
 use JSON;
 
-our $VERSION = '0.28';
+our $VERSION = '0.29';
 
 =head1 NAME