diff --git a/api/models/category.py b/api/models/category.py index e668f9e..1332744 100644 --- a/api/models/category.py +++ b/api/models/category.py @@ -11,8 +11,6 @@ class Category(db.Model): texts = db.relationship( 'CategoryTexts', backref='category', lazy='dynamic') - __mapper_args__ = {'order_by' : name.asc()} - def path(self, locale='sv_SE'): row = CategoryTreeI18n.query.filter_by( category_id=self.id, locale=locale).first() diff --git a/api/models/designer.py b/api/models/designer.py index f41660f..31d08d5 100644 --- a/api/models/designer.py +++ b/api/models/designer.py @@ -21,8 +21,6 @@ class Designer(db.Model): visible_search = db.Column(db.Integer(), nullable=False, default=1) pricepremium = db.Column(db.Numeric(), nullable=False, default=0) - __mapper_args__ = {'order_by' : name.asc()} - def __init__(self, name, username, territory, currency): self.name = name self.username = username diff --git a/api/resources/categories.py b/api/resources/categories.py index 2403df4..1050b25 100644 --- a/api/resources/categories.py +++ b/api/resources/categories.py @@ -10,7 +10,8 @@ mod = Blueprint('categories', __name__, url_prefix='/categories') def list(): page = request.args.get('page', 1, type=int) per_page = request.args.get('per_page', 10, type=int) - pagination = Category.query.paginate(page=page, per_page=per_page) + query = Category.query.order_by(Category.name.asc()) + pagination = query.paginate(page=page, per_page=per_page) j = { 'pagination': pagination_to_dict(pagination), 'data': [item.to_json() for item in pagination.items] diff --git a/api/resources/designers.py b/api/resources/designers.py index 5d5ee7c..9b43450 100644 --- a/api/resources/designers.py +++ b/api/resources/designers.py @@ -12,7 +12,8 @@ mod = Blueprint('designers', __name__, url_prefix='/designers') def list(): page = request.args.get('page', 1, type=int) per_page = request.args.get('per_page', 10, type=int) - pagination = Designer.query.paginate(page=page, per_page=per_page) + query = Designer.query.order_by(Designer.name.asc()) + pagination = query.paginate(page=page, per_page=per_page) j = { 'pagination': pagination_to_dict(pagination), 'data': [item.to_json() for item in pagination.items]