diff --git a/app/inventory/views.py b/app/inventory/views.py index bcd6c00b71f99b9ff537796b3844d16c1cfadb8b..e5e105839092b4fe8b63f6bf27ba2a7889f51f55 100644 --- a/app/inventory/views.py +++ b/app/inventory/views.py @@ -73,14 +73,7 @@ def retrieve_items(): 'status', 'parent', ) - field = getattr(models.Item, columns[order_column]) - if 4 < order_column < 9: - query = query.join(field) - relationship_class = getattr(models, columns[order_column].title()) - relationship_field = getattr(relationship_class, 'name') - query = query.order_by(order_dir(relationship_field)) - else: - query = query.order_by(order_dir(getattr(models.Item, columns[order_column]))) + query = query.order_by(order_dir(getattr(models.Item, columns[order_column]))) # Limit and offset the query if per_page != -1: query = query.limit(per_page) diff --git a/app/static/js/items.js b/app/static/js/items.js index 75dbff61acdded1c7548181d066862b95248574b..364a509cbc8dc47ccbb6cbebf8cfbf0aa4b89356 100644 --- a/app/static/js/items.js +++ b/app/static/js/items.js @@ -64,6 +64,10 @@ $(document).ready(function() { "visible": false, "searchable": false }, + { + "targets": [5, 6, 7, 8], + "orderable": false + }, { "targets": [1, 9], "render": function(data, type, row) {