Merge branch 'master' into split-sms-and-retry

app/dao/permissions_dao.py

@@ -68,6 +68,8 @@ class PermissionDAO(DAOClass):
             query = self.get_query(filter_by_dict={'user': user.id, 'service': service.id})
             query.delete()
             for p in permissions:
+                p.user = user
+                p.service = service
                 self.create_instance(p, _commit=False)
         except Exception as e:
             if _commit:

app/dao/templates_dao.py

@@ -45,7 +45,7 @@ def dao_get_all_templates_for_service(service_id):
         service_id=service_id,
         archived=False
     ).order_by(
-        asc(Template.updated_at), asc(Template.created_at)
+        desc(Template.created_at)
     ).all()