summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2021-10-15 09:12:29 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2021-10-25 12:06:03 +0200
commit666f1261daf65aedae4610f79f025f4bd6a9fe9d (patch)
tree2674a7f07327b0d8f599354928e032b64d7f7689
parent6469f7cc97ff4fc55cf7d52629b4a2fcf25c7a55 (diff)
downloadIshtar-666f1261daf65aedae4610f79f025f4bd6a9fe9d.tar.bz2
Ishtar-666f1261daf65aedae4610f79f025f4bd6a9fe9d.zip
Admin: fix ambigius variable names
-rw-r--r--ishtar_common/admin.py40
1 files changed, 20 insertions, 20 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index f811a98e1..349b3d5eb 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -129,7 +129,7 @@ def change_value(attribute, value, description):
for obj in queryset.order_by("pk"):
setattr(obj, attribute, value)
obj.save()
- url = (
+ c_url = (
reverse(
"admin:%s_%s_changelist"
% (modeladmin.model._meta.app_label, modeladmin.model._meta.model_name)
@@ -137,7 +137,7 @@ def change_value(attribute, value, description):
+ "?"
+ urllib.parse.urlencode(request.GET)
)
- return HttpResponseRedirect(url)
+ return HttpResponseRedirect(c_url)
_change_value.short_description = description
_change_value.__name__ = str(slugify(description))
@@ -615,11 +615,11 @@ class ImportActionAdmin(admin.ModelAdmin):
" ; ".join(missing_parent)
),
)
- url = reverse(
+ c_url = reverse(
"admin:%s_%s_changelist"
% (self.model._meta.app_label, self.model._meta.model_name)
)
- return HttpResponseRedirect(url)
+ return HttpResponseRedirect(c_url)
if not form:
form = ImportGenericForm()
return render(
@@ -842,11 +842,11 @@ class ImportGEOJSONActionAdmin(object):
request, str(_("%d item(s) updated.")) % updated
)
self.import_geojson_clean(tempdir)
- url = reverse(
+ c_url = reverse(
"admin:%s_%s_changelist"
% (self.model._meta.app_label, self.model._meta.model_name)
)
- return HttpResponseRedirect(url)
+ return HttpResponseRedirect(c_url)
if not form:
form = ImportGeoJsonForm()
return render(
@@ -899,11 +899,11 @@ class ImportJSONActionAdmin(admin.ModelAdmin):
count, model
),
)
- url = reverse(
+ c_url = reverse(
"admin:%s_%s_changelist"
% (self.model._meta.app_label, self.model._meta.model_name)
)
- return HttpResponseRedirect(url)
+ return HttpResponseRedirect(c_url)
if not form:
form = ImportJSONForm()
return render(
@@ -1163,11 +1163,11 @@ class CreateDepartmentActionAdmin(GeneralTypeAdmin):
nb, area_name or area.label
),
)
- url = reverse(
+ c_url = reverse(
"admin:%s_%s_changelist"
% (self.model._meta.app_label, self.model._meta.model_name)
)
- return HttpResponseRedirect(url)
+ return HttpResponseRedirect(c_url)
if not form:
form = CreateAreaForm()
return render(
@@ -1319,7 +1319,7 @@ def duplicate_importertype(modeladmin, request, queryset):
queryset.count(), " ; ".join(res)
),
)
- url = (
+ c_url = (
reverse(
"admin:%s_%s_changelist"
% (modeladmin.model._meta.app_label, modeladmin.model._meta.model_name)
@@ -1327,7 +1327,7 @@ def duplicate_importertype(modeladmin, request, queryset):
+ "?"
+ urllib.parse.urlencode(request.GET)
)
- return HttpResponseRedirect(url)
+ return HttpResponseRedirect(c_url)
duplicate_importertype.short_description = _("Duplicate")
@@ -1338,7 +1338,7 @@ def generate_libreoffice_template(modeladmin, request, queryset):
messages.add_message(
request, messages.ERROR, str(_("Select only one importer."))
)
- url = (
+ c_url = (
reverse(
"admin:%s_%s_changelist"
% (modeladmin.model._meta.app_label, modeladmin.model._meta.model_name)
@@ -1346,7 +1346,7 @@ def generate_libreoffice_template(modeladmin, request, queryset):
+ "?"
+ urllib.parse.urlencode(request.GET)
)
- return HttpResponseRedirect(url)
+ return HttpResponseRedirect(c_url)
importer_type = queryset.all()[0]
dest_filename = importer_type.get_libreoffice_template()
@@ -1433,7 +1433,7 @@ def duplicate_importercolumn(modeladmin, request, queryset):
queryset.count(), " ; ".join(res)
),
)
- url = (
+ c_url = (
reverse(
"admin:%s_%s_changelist"
% (modeladmin.model._meta.app_label, modeladmin.model._meta.model_name)
@@ -1441,7 +1441,7 @@ def duplicate_importercolumn(modeladmin, request, queryset):
+ "?"
+ urllib.parse.urlencode(request.GET)
)
- return HttpResponseRedirect(url)
+ return HttpResponseRedirect(c_url)
duplicate_importercolumn.short_description = _("Duplicate")
@@ -1462,7 +1462,7 @@ def shift_right(modeladmin, request, queryset):
messages.INFO,
str(_("{} importer column(s) right-shifted.")).format(queryset.count()),
)
- url = (
+ c_url = (
reverse(
"admin:%s_%s_changelist"
% (modeladmin.model._meta.app_label, modeladmin.model._meta.model_name)
@@ -1470,7 +1470,7 @@ def shift_right(modeladmin, request, queryset):
+ "?"
+ urllib.parse.urlencode(request.GET)
)
- return HttpResponseRedirect(url)
+ return HttpResponseRedirect(c_url)
shift_right.short_description = _("Shift right")
@@ -1510,7 +1510,7 @@ def shift_left(modeladmin, request, queryset):
_("{} importer column(s) not left-shifted: no " "place available.")
).format(errors),
)
- url = (
+ c_url = (
reverse(
"admin:%s_%s_changelist"
% (modeladmin.model._meta.app_label, modeladmin.model._meta.model_name)
@@ -1518,7 +1518,7 @@ def shift_left(modeladmin, request, queryset):
+ "?"
+ urllib.parse.urlencode(request.GET)
)
- return HttpResponseRedirect(url)
+ return HttpResponseRedirect(c_url)
shift_left.short_description = _("Shift left")