diff --git a/lib/hawat/blueprints/networks/__init__.py b/lib/hawat/blueprints/networks/__init__.py index 9282752c68cd9920e0903c309f47ee2d0a9a4131..14924938f637f69120bb9ff450e566f277ff6171 100644 --- a/lib/hawat/blueprints/networks/__init__.py +++ b/lib/hawat/blueprints/networks/__init__.py @@ -139,7 +139,9 @@ class ListView(HTMLMixin, SQLAlchemyMixin, ItemListView): 'netname.desc': lambda x, y: x.order_by(y.netname.desc()), 'netname.asc': lambda x, y: x.order_by(y.netname.asc()), 'network.desc': lambda x, y: x.order_by(y.network.desc()), - 'network.asc': lambda x, y: x.order_by(y.network.asc()) + 'network.asc': lambda x, y: x.order_by(y.network.asc()), + 'rank.desc': lambda x, y: x.order_by(y.rank.desc()), + 'rank.asc': lambda x, y: x.order_by(y.rank.asc()) } query = sortmap[form_args['sortby']](query, model) return query diff --git a/lib/hawat/blueprints/networks/forms.py b/lib/hawat/blueprints/networks/forms.py index 64a92735dd6b6f3e8c3bce3c33d0b9235ec416e2..bc90343a3db73b9811e60dd8be2bf143b8a58614 100644 --- a/lib/hawat/blueprints/networks/forms.py +++ b/lib/hawat/blueprints/networks/forms.py @@ -155,7 +155,9 @@ class NetworkSearchForm(hawat.forms.BaseSearchForm): ('netname.desc', lazy_gettext('by netname descending')), ('netname.asc', lazy_gettext('by netname ascending')), ('network.desc', lazy_gettext('by network descending')), - ('network.asc', lazy_gettext('by network ascending')) + ('network.asc', lazy_gettext('by network ascending')), + ('rank.asc', lazy_gettext('by rank ascending')), + ('rank.desc', lazy_gettext('by rank descending')) ], default='netname.asc' ) diff --git a/lib/hawat/blueprints/networks/templates/networks/list.html b/lib/hawat/blueprints/networks/templates/networks/list.html index fd8510240f340ac764339b15229249ef0a37dd79..a9b1c8ef61919c0015650da2b7cee12d034917bb 100644 --- a/lib/hawat/blueprints/networks/templates/networks/list.html +++ b/lib/hawat/blueprints/networks/templates/networks/list.html @@ -41,6 +41,9 @@ <th> {{ _('Network') }} {{ macros_site.render_sorter(request.endpoint, query_params, 'network') }} </th> + <th> + {{ _('Rank') }} {{ macros_site.render_sorter(request.endpoint, query_params, 'rank') }} + </th> <th> {{ _('Description') }} </th> @@ -66,6 +69,9 @@ <td> {{ item.network | default(_('<< unknown >>'), True) }} </td> + <td> + {{ item.rank | default(_('<< None >>'), True) }} + </td> <td> {{ item.description | default(_('<< unknown >>'), True) | truncate(50) }} </td>