Refactored exception handling for order_field_name

2016-03-14 11:09:18 -04:00
parent f44220c3de
commit f004d97bf1
4 changed files with 25 additions and 1 deletions
@@ -1,4 +1,8 @@
+<<<<<<< Updated upstream
 VERSION = (2, 0, 12)
+=======
+VERSION = (2, 0, 14)
+>>>>>>> Stashed changes
 DEV_N = None


@@ -194,7 +194,7 @@ class SortableAdmin(SortableAdminBase, ModelAdmin):
            except (AttributeError, IndexError):
                # for Django 1.5.x
                order_field_name = opts.ordering[0]
-            finally:
+            except (AttributeError, IndexError):
                order_field_name = 'order'

            objects = objects.order_by(sortable_by_expression, order_field_name)