diff options
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index fc8151d8d..4f7adef39 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -371,9 +371,9 @@ def get_item(model, func_name, default_name, extra_request_keys=[], isinstance(c_field, ImageField): if dct[k]: or_reqs.append( - (k, {k.split('__')[0]+'__exact': ''})) + (k, {k.split('__')[0] + '__exact': ''})) else: - dct[k.split('__')[0]+'__regex'] = '.{1}.*' + dct[k.split('__')[0] + '__regex'] = '.{1}.*' for k in dated_fields: if k in dct: if not dct[k]: @@ -440,7 +440,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], k = k[:-len("__pk")] + "__label" if '__' in k: k = k.split('__')[0] - orders.append(sign+k) + orders.append(sign + k) items = items.order_by(*orders) elif q: for k in table_cols: @@ -448,7 +448,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], manual_sort_key = k break if not manual_sort_key and model._meta.ordering: - orders = [sign+k for k in model._meta.ordering] + orders = [sign + k for k in model._meta.ordering] items = items.order_by(*orders) # pager management start, end = 0, None @@ -463,8 +463,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[], assert page_nb >= 1 except (ValueError, AssertionError): pass - start = (page_nb-1)*row_nb - end = page_nb*row_nb + start = (page_nb - 1) * row_nb + end = page_nb * row_nb items_nb = items.count() if manual_sort_key: items = items.all() @@ -510,7 +510,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], rows = [] for data in datas: try: - lnk = link_template % reverse('show-'+default_name, + lnk = link_template % reverse('show-' + default_name, args=[data[0], '']) except NoReverseMatch: print '"show-' + default_name + "\" args (" + \ @@ -525,7 +525,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], "records": items_nb, "rows": rows, "page": page_nb, - "total": (items_nb/row_nb + 1) if row_nb else items_nb, + "total": (items_nb / row_nb + 1) if row_nb else items_nb, }) return HttpResponse(data, mimetype='text/plain') elif data_type == "csv": @@ -560,7 +560,7 @@ def show_item(model, name, extra_dct=None): except ObjectDoesNotExist: return HttpResponse(None) doc_type = 'type' in dct and dct.pop('type') - url_name = u"/".join(reverse('show-'+name, args=['0', ''] + url_name = u"/".join(reverse('show-' + name, args=['0', ''] ).split('/')[:-2]) + u"/" dct['current_window_url'] = url_name date = 'date' in dct and dct.pop('date') @@ -720,7 +720,7 @@ def autocomplete_author(request): def new_item(model, frm): def func(request, parent_name, limits=''): model_name = model._meta.object_name - if not check_permission(request, 'add_'+model_name.lower()): + if not check_permission(request, 'add_' + model_name.lower()): not_permitted_msg = ugettext(u"Operation not permitted.") return HttpResponse(not_permitted_msg) dct = {'title': unicode(_(u'New %s' % model_name.lower()))} @@ -907,13 +907,13 @@ def merge_action(model, form, key): q = model.merge_candidate.through.objects context = {'current_url': current_url, 'current_page': page, - 'max_page': q.count()/ITEM_PER_PAGE} + 'max_page': q.count() / ITEM_PER_PAGE} if page < context["max_page"]: context['next_page'] = page + 1 if page > 1: context['previous_page'] = page - 1 - item_nb = page*ITEM_PER_PAGE + item_nb = page * ITEM_PER_PAGE item_nb_1 = item_nb + ITEM_PER_PAGE from_key = 'from_' + key to_key = 'to_' + key @@ -928,7 +928,7 @@ def merge_action(model, form, key): else: context['formset'] = FormSet(queryset=queryset) return render_to_response( - 'ishtar/merge_'+key+'.html', context, + 'ishtar/merge_' + key + '.html', context, context_instance=RequestContext(request)) return merge |