Replaced Up/Down order on ranks/forums lists.

misago/users/admin.py

@@ -2,8 +2,8 @@ from django.conf.urls import url
 from django.utils.translation import ugettext_lazy as _
 from misago.users.views.admin.bans import BansList, NewBan, EditBan, DeleteBan
 from misago.users.views.admin.ranks import (RanksList, NewRank, EditRank,
-                                            DeleteRank, MoveUpRank,
-                                            MoveDownRank, DefaultRank)
+                                            DeleteRank, MoveDownRank,
+                                            MoveUpRank, DefaultRank)
 from misago.users.views.admin.users import UsersList, NewUser, EditUser
 from misago.users.views.admin.warnings import (WarningsList, NewWarning,
                                                EditWarning, DeleteWarning)
@@ -30,8 +30,8 @@ class MisagoAdminExtension(object):
             url(r'^new/$', NewRank.as_view(), name='new'),
             url(r'^edit/(?P<rank_id>\d+)/$', EditRank.as_view(), name='edit'),
             url(r'^default/(?P<rank_id>\d+)/$', DefaultRank.as_view(), name='default'),
-            url(r'^move/up/(?P<rank_id>\d+)/$', MoveUpRank.as_view(), name='up'),
             url(r'^move/down/(?P<rank_id>\d+)/$', MoveDownRank.as_view(), name='down'),
+            url(r'^move/up/(?P<rank_id>\d+)/$', MoveUpRank.as_view(), name='up'),
             url(r'^delete/(?P<rank_id>\d+)/$', DeleteRank.as_view(), name='delete'),
         )
 

misago/users/views/admin/ranks.py

@@ -51,11 +51,11 @@ class DeleteRank(RankAdmin, generic.ButtonView):
         messages.success(request, message)
 
 
-class MoveUpRank(RankAdmin, generic.ButtonView):
+class MoveDownRank(RankAdmin, generic.ButtonView):
     def button_action(self, request, target):
         try:
-            other_target = Rank.objects.filter(order__lt=target.order)
-            other_target = other_target.latest('order')
+            other_target = Rank.objects.filter(order__gt=target.order)
+            other_target = other_target.earliest('order')
         except Rank.DoesNotExist:
             other_target = None
 
@@ -63,15 +63,15 @@ class MoveUpRank(RankAdmin, generic.ButtonView):
             other_target.order, target.order = target.order, other_target.order
             other_target.save(update_fields=['order'])
             target.save(update_fields=['order'])
-            message = _('Rank "%s" has been moved up.') % unicode(target.name)
+            message = _('Rank "%s" has been moved down.') % unicode(target.name)
             messages.success(request, message)
 
 
-class MoveDownRank(RankAdmin, generic.ButtonView):
+class MoveUpRank(RankAdmin, generic.ButtonView):
     def button_action(self, request, target):
         try:
-            other_target = Rank.objects.filter(order__gt=target.order)
-            other_target = other_target.earliest('order')
+            other_target = Rank.objects.filter(order__lt=target.order)
+            other_target = other_target.latest('order')
         except Rank.DoesNotExist:
             other_target = None
 
@@ -79,7 +79,7 @@ class MoveDownRank(RankAdmin, generic.ButtonView):
             other_target.order, target.order = target.order, other_target.order
             other_target.save(update_fields=['order'])
             target.save(update_fields=['order'])
-            message = _('Rank "%s" has been moved down.') % unicode(target.name)
+            message = _('Rank "%s" has been moved up.') % unicode(target.name)
             messages.success(request, message)