Migration to Django 2.2 - many fixes

- remove redondant permissions
- fix missing kwargs for widget and form fields
- fix default to callable for model field
- quick and dirty fix for datepicker
- is_authenticated() -> is_authenticated
- fix registration urls
- remove six usage (no more python2)

1 files changed, 5 insertions, 4 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 752594616..69f8ec92c 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -61,7 +61,8 @@ from django.http import HttpResponseRedirect, HttpResponse
 from django.shortcuts import render
 from django.urls import reverse
 from django.utils.decorators import method_decorator
-from django.utils.text import slugify, mark_safe
+from django.utils.text import slugify
+from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.csrf import csrf_protect
 
@@ -105,7 +106,7 @@ ISHTAR_FORMS = [
 
 class ImportGenericForm(forms.Form):
     csv_file = forms.FileField(
-        _("CSV file"),
+        label=_("CSV file"),
         help_text=_("Only unicode encoding is managed - convert your" " file first"),
     )
 
@@ -709,7 +710,7 @@ class ImportActionAdmin(admin.ModelAdmin):
 
 class ImportGeoJsonForm(forms.Form):
     json_file = forms.FileField(
-        _("Geojson file"),
+        label=_("Geojson file"),
         help_text=_(
             "Only unicode encoding is managed - convert your"
             " file first. The file must be a geojson file or a zip "
@@ -936,7 +937,7 @@ class ImportGEOJSONActionAdmin(object):
 
 class ImportJSONForm(forms.Form):
     json_file = forms.FileField(
-        _("Zipped JSON file"),
+        label=_("Zipped JSON file"),
         help_text=_("Import from a zipped JSON file generated by Ishtar"),
     )