Users/Roles admin tweaks.

misago/templates/misago/admin/forumroles/list.html

@@ -40,7 +40,7 @@
 
 
 {% block emptylist %}
-<td>
+<td colspan="3">
   <p>{% trans "No forum roles are currently defined." %}</p>
 </td>
 {% endblock emptylist %}

misago/templates/misago/admin/ranks/list.html

@@ -96,7 +96,7 @@
 
 
 {% block emptylist %}
-<td>
+<td colspan="7">
   <p>{% trans "No ranks are currently defined." %}</p>
 </td>
 {% endblock emptylist %}

misago/templates/misago/admin/roles/list.html

@@ -40,7 +40,7 @@
 
 
 {% block emptylist %}
-<td>
+<td colspan="3">
   <p>{% trans "No user roles are currently defined." %}</p>
 </td>
 {% endblock emptylist %}

misago/users/forms/admin.py

@@ -16,7 +16,7 @@ class RankForm(forms.ModelForm):
         help_text=_('Optional, singular version of rank name displayed by '
                     'user names. For example "GM" or "Dev".'))
     description = forms.CharField(
-        label=_("Description"), max_length=1024, required=False,
+        label=_("Description"), max_length=2048, required=False,
         widget=forms.Textarea(attrs={'rows': 3}),
         help_text=_("Optional description explaining function or status of "
                     "members distincted with this rank."))
@@ -51,7 +51,8 @@ class RankForm(forms.ModelForm):
             'is_on_index',
         ]
 
-    def clean_name(self):
-        data = self.cleaned_data['name']
-        self.instance.set_name(data)
+    def clean(self):
+        data = super(RankForm, self).clean()
+
+        self.instance.set_name(data.get['name'])
         return data

misago/users/models/rankmodel.py

@@ -58,18 +58,6 @@ class Rank(models.Model):
         except Rank.DoesNotExist:
             self.order = 0
 
-    def next(self):
-        try:
-            return Rank.objects.filter(order__gt=self.order).earliest('order')
-        except Rank.DoesNotExist:
-            return None
-
-    def prev(self):
-        try:
-            return Rank.objects.filter(order__lt=self.order).latest('order')
-        except Rank.DoesNotExist:
-            return None
-
 
 """register model in misago admin"""
 site.add_node(

misago/users/views/rankadmin.py

@@ -53,7 +53,12 @@ class DeleteRank(RankAdmin, generic.ButtonView):
 
 class MoveUpRank(RankAdmin, generic.ButtonView):
     def button_action(self, request, target):
-        other_target = target.prev()
+        try:
+            other_target = Rank.objects.filter(order__lt=self.order)
+            other_target = other_target.latest('order')
+        except Rank.DoesNotExist:
+            other_target = None
+
         if other_target:
             other_target.order, target.order = target.order, other_target.order
             other_target.save(update_fields=['order'])
@@ -64,7 +69,12 @@ class MoveUpRank(RankAdmin, generic.ButtonView):
 
 class MoveDownRank(RankAdmin, generic.ButtonView):
     def button_action(self, request, target):
-        other_target = target.next()
+        try:
+            other_target = Rank.objects.filter(order__gt=self.order)
+            other_target = other_target.earliest('order')
+        except Rank.DoesNotExist:
+            other_target = None
+
         if other_target:
             other_target.order, target.order = target.order, other_target.order
             other_target.save(update_fields=['order'])