diff options
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index b662c1a4d..2176c4519 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -948,7 +948,7 @@ def reset_wizards(request): ITEM_PER_PAGE = 20 -def merge_action(model, form, key): +def merge_action(model, form, key, name_key="name"): def merge(request, page=1): current_url = key + '_merge' if not page: @@ -974,7 +974,8 @@ def merge_action(model, form, key): item_nb_1 = item_nb + ITEM_PER_PAGE from_key = 'from_' + key to_key = 'to_' + key - queryset = q.all().order_by(from_key + '__name')[item_nb:item_nb_1] + queryset = q.all().order_by( + from_key + '__' + name_key)[item_nb:item_nb_1] FormSet.from_key = from_key FormSet.to_key = to_key if request.method == 'POST': @@ -1016,7 +1017,7 @@ organization_merge = merge_action( class IshtarMixin(object): - page_name = u"" + page_name = "" def get_context_data(self, **kwargs): context = super(IshtarMixin, self).get_context_data(**kwargs) |