diff options
Diffstat (limited to 'chimere/admin.py')
| -rw-r--r-- | chimere/admin.py | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/chimere/admin.py b/chimere/admin.py index cdcd053..fda0dd7 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -26,7 +26,7 @@ from copy import deepcopy from django.conf import settings from django.contrib import admin, messages from django.contrib.admin import SimpleListFilter -from django.contrib.admin.util import flatten_fieldsets +from django.contrib.admin.utils import flatten_fieldsets from django.contrib.auth.admin import UserAdmin as VanillaUserAdmin from django.contrib.auth.models import User from django.core.exceptions import ObjectDoesNotExist @@ -57,18 +57,18 @@ def disable(modeladmin, request, queryset): for item in queryset: item.status = 'D' item.save() -disable.short_description = _(u"Disable") +disable.short_description = _("Disable") def validate(modeladmin, request, queryset): for item in queryset: item.status = 'A' item.save() -validate.short_description = _(u"Validate") +validate.short_description = _("Validate") def export_to_kml(modeladmin, request, queryset): - u""" + """ Export data to KML """ filename, result = KMLManager.export(queryset) @@ -76,11 +76,11 @@ def export_to_kml(modeladmin, request, queryset): mimetype='application/vnd.google-earth.kml+xml') response['Content-Disposition'] = 'attachment; filename=%s' % filename return response -export_to_kml.short_description = _(u"Export to KML") +export_to_kml.short_description = _("Export to KML") def export_to_shapefile(modeladmin, request, queryset): - u""" + """ Export data to Shapefile """ filename, zip_stream = ShapefileManager.export(queryset) @@ -91,18 +91,18 @@ def export_to_shapefile(modeladmin, request, queryset): response['Content-Type'] = 'application/zip' response.write(zip_stream) return response -export_to_shapefile.short_description = _(u"Export to Shapefile") +export_to_shapefile.short_description = _("Export to Shapefile") def export_to_csv(modeladmin, request, queryset): - u""" + """ Export data to CSV """ filename, result = CSVManager.export(queryset) response = HttpResponse(result, mimetype='text/csv') response['Content-Disposition'] = 'attachment; filename=%s' % filename return response -export_to_csv.short_description = _(u"Export to CSV") +export_to_csv.short_description = _("Export to CSV") def managed_modified(modeladmin, request, queryset): @@ -110,8 +110,8 @@ def managed_modified(modeladmin, request, queryset): redirect_url = request.get_full_path().split('admin_modification')[0] if queryset.count() != 1 and len(set([i.ref_item or i for i in queryset.all()])) != 1: - messages.error(request, _(u"Only one item can be managed at a " - u"time.")) + messages.error(request, _("Only one item can be managed at a " + "time.")) return HttpResponseRedirect(redirect_url) item = queryset.all()[0] @@ -120,8 +120,8 @@ def managed_modified(modeladmin, request, queryset): item = modeladmin.model.objects.filter(ref_item=item)\ .exclude(pk=item.pk).all()[0] except IndexError: - messages.error(request, _(u"No modified item associated " - u"to the selected item.")) + messages.error(request, _("No modified item associated " + "to the selected item.")) return HttpResponseRedirect(redirect_url) item_ref = item.ref_item if request.POST.get('rapprochement'): @@ -155,12 +155,12 @@ def managed_modified(modeladmin, request, queryset): except (ValueError, ObjectDoesNotExist): pass item.delete() - messages.success(request, _(u"Modified item traited.")) + messages.success(request, _("Modified item traited.")) return HttpResponseRedirect(redirect_url) return render_to_response('admin/chimere/managed_modified.html', {'item': item, 'item_ref': item_ref}, context_instance=RequestContext(request)) -managed_modified.short_description = _(u"Managed modified items") +managed_modified.short_description = _("Managed modified items") class CatLimitInline(admin.TabularInline): @@ -252,10 +252,10 @@ class CategoriesListFilter(SimpleListFilter): def lookups(self, request, model_admin): if request.user.subcategory_limit_to.count(): q = request.user.subcategory_limit_to - return [(l.subcategory.pk, unicode(l.subcategory)) + return [(l.subcategory.pk, str(l.subcategory)) for l in q.all()] q = SubCategory.objects - return [(cat.pk, unicode(cat)) for cat in q.all()] + return [(cat.pk, str(cat)) for cat in q.all()] def queryset(self, request, queryset): if self.value(): @@ -285,16 +285,16 @@ MARKER_FIELDSETS = [ 'fields': ['point', 'name', 'status', 'categories', 'description', 'keywords', 'start_date', 'end_date'] }], - [_(u"Submitter"), { + [_("Submitter"), { 'classes': ('collapse',), 'fields': ('submiter_name', 'submiter_email', 'submiter_comment') }], - [_(u"Import"), { + [_("Import"), { 'classes': ('collapse',), 'fields': ('not_for_osm', 'modified_since_import', 'import_source', 'origin', 'license') }], - [_(u"Associated items"), { + [_("Associated items"), { 'classes': ('collapse',), 'fields': ['ref_item', ] }] @@ -363,7 +363,7 @@ class MarkerAdmin(admin.ModelAdmin): self, request, Marker.objects.filter(pk=item_id)) def get_urls(self): - from django.conf.urls.defaults import patterns, url + from django.conf.urls import patterns, url urls = super(MarkerAdmin, self).get_urls() my_urls = patterns( '', @@ -384,7 +384,7 @@ class MarkerAdmin(admin.ModelAdmin): return form form = type('MarkerAdminLimit', (form,), {'categories_choices': [ - (l.subcategory.pk, unicode(l.subcategory)) + (l.subcategory.pk, str(l.subcategory)) for l in q.all()]}) return form @@ -455,48 +455,48 @@ class AreaAdmin(admin.ModelAdmin): def importing(modeladmin, request, queryset): for importer in queryset: - importer.state = unicode(tasks.IMPORT_MESSAGES['import_pending'][0]) + importer.state = str(tasks.IMPORT_MESSAGES['import_pending'][0]) importer.save() tasks.importing(importer.pk) -importing.short_description = _(u"Import") +importing.short_description = _("Import") def cancel_import(modeladmin, request, queryset): for importer in queryset: importer.state = tasks.IMPORT_MESSAGES['import_cancel'][0] importer.save() -cancel_import.short_description = _(u"Cancel import") +cancel_import.short_description = _("Cancel import") def cancel_export(modeladmin, request, queryset): for importer in queryset: importer.state = tasks.IMPORT_MESSAGES['export_cancel'][0] importer.save() -cancel_export.short_description = _(u"Cancel export") +cancel_export.short_description = _("Cancel export") def export_to_osm(modeladmin, request, queryset): if queryset.count() > 1: messages.error(request, - _(u"Can manage only one OSM export at a time.")) + _("Can manage only one OSM export at a time.")) return HttpResponseRedirect(request.get_full_path()) importer = queryset.all()[0] if Marker.objects.filter(categories__in=importer.categories.all(), status='I').count(): - messages.error(request, _(u"You must treat all item with the status " - u"\"imported\" before exporting to OSM.")) + messages.error(request, _("You must treat all item with the status " + "\"imported\" before exporting to OSM.")) return HttpResponseRedirect(request.get_full_path()) if importer.importer_type != 'OSM': messages.error(request, - _(u"Only OSM importer are managed for export.")) + _("Only OSM importer are managed for export.")) return HttpResponseRedirect(request.get_full_path()) item_nb = Marker.objects.filter( status='A', categories=importer.categories.all(), not_for_osm=False, modified_since_import=True, route=None).count() if not item_nb: messages.error(request, - _(u"No point of interest are concerned by this " - u"export.")) + _("No point of interest are concerned by this " + "export.")) return HttpResponseRedirect(request.get_full_path()) form = None if request.method == 'POST' and ( @@ -504,21 +504,21 @@ def export_to_osm(modeladmin, request, queryset): or 'password' in request.POST): form = OSMForm(request.POST) if form.is_valid(): - importer.state = unicode( + importer.state = str( tasks.IMPORT_MESSAGES['export_pending'][0]) importer.save() tasks.exporting(importer.pk, form.cleaned_data) - messages.success(request, _(u"Export launched.")) + messages.success(request, _("Export launched.")) return HttpResponseRedirect(request.get_full_path()) else: form = OSMForm() - msg_item = _(u"%s point(s) of interest concerned by this export before " - u"bounding box filter.") % item_nb + msg_item = _("%s point(s) of interest concerned by this export before " + "bounding box filter.") % item_nb return render_to_response('admin/chimere/osm_export.html', {'item': importer, 'form': form, 'msg_item': msg_item}, context_instance=RequestContext(request)) -export_to_osm.short_description = _(u"Export to osm") +export_to_osm.short_description = _("Export to osm") class ImporterKeyInline(admin.TabularInline): |