Sort group and pad listings

2 files changed, 5 insertions, 3 deletions

diff --git a/models.py b/models.py
index 252cb20..2111b31 100644
--- a/models.py
+++ b/models.py
@@ -155,7 +155,8 @@ class Pad(APIMixin, SessionMixin, db.Model):
                       nullable=True)
 
     group = db.relationship(
-        "Group", backref=backref("pads", cascade="delete"))
+        "Group", backref=backref("pads", order_by="desc(Pad.created)",
+                                 cascade="delete"))
 
     def __str__(self):
         return self.name
diff --git a/views.py b/views.py
index 457be01..827415c 100644
--- a/views.py
+++ b/views.py
@@ -69,7 +69,8 @@ def index():
         Member.active == True,
     ).all()
 
-    groups = [member.group for member in memberships]
+    groups = sorted([member.group for member in memberships],
+                    key=(lambda group: group.name))
     return dict(groups=groups, create_form=form)
 
 
@@ -80,7 +81,7 @@ def index():
 def browse(page):
     public_groups = Group.query.filter(
         Group.browsable == True,
-    )
+    ).order_by(Group.name)
 
     pageination = public_groups.paginate(page, 10)
     return {'groups': pageination.items,