From d7fae5dcfc62d81e44e634ffbf35d9f4aa2577ab Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 24 Oct 2018 16:56:05 +0200
Subject: Admin - CSV import: fix float conversion

---
 ishtar_common/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 7c5d505b3..b2a3f399e 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -322,7 +322,7 @@ class ImportActionAdmin(admin.ModelAdmin):
                             if not value:
                                 value = None
                             else:
-                                value = value(value)
+                                value = float(value)
                         elif isinstance(field, BooleanField):
                             if value in ('true', 'True', '1'):
                                 value = True
-- 
cgit v1.2.3


From 70ce70650144e92b200c62d1e334c8636add9f62 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 26 Oct 2018 13:13:10 +0200
Subject: Instal script: backports check the contrib section - install postgres
 contrib

---
 install/ishtar-install | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/ishtar-install b/install/ishtar-install
index f9c841cb6..a08407622 100755
--- a/install/ishtar-install
+++ b/install/ishtar-install
@@ -131,10 +131,10 @@ do_install() {
                 ;;
             esac
             set +e
-            MAINBACKS=`cat /etc/apt/sources.list | grep $dist_version'-backports' |grep -v "^#"`
+            MAINBACKS=`cat /etc/apt/sources.list | grep "contrib" | grep $dist_version'-backports' |grep -v "^#"`
             ALLBACKS=''
             if [ "$(ls -A /etc/apt/sources.list.d/)" ]; then
-                ALLBACKS=`cat /etc/apt/sources.list.d/* | grep $dist_version'-backports' |grep -v "^#"`
+                ALLBACKS=`cat /etc/apt/sources.list.d/* | grep "contrib" | grep $dist_version'-backports' |grep -v "^#"`
             fi
             set -e
             if [ "$ALLBACKS" != '' ] || [ "$MAINBACKS" != '' ]; then
@@ -337,7 +337,7 @@ EOF
             if [ "$dist_version" == "jessie" ]; then
                 if [ "$backports_activated" != 'true' ]; then
                     echo ""
-                    cecho r "  In order to install Ishtar you have to activate Debian backports."
+                    cecho r "  In order to install Ishtar you have to activate Debian backports with the contrib section."
                     echo "  To do that:"
                     echo ""
                     echo "    echo 'deb http://ftp.debian.org/debian jessie-backports main contrib non-free' >> /etc/apt/sources.list"
@@ -413,7 +413,7 @@ EOF
                     cecho y "Installing postgresql"
                     echo ""
                     POSTGIS=postgresql-9.6-postgis-2.3
-                    ( set -x; $sh_c 'sleep 3; apt-get install -y -q postgresql' $POSTGIS $POSTGIS'-scripts' )
+                    ( set -x; $sh_c 'sleep 3; apt-get install -y -q postgresql' $POSTGIS $POSTGIS'-scripts postgresql-contrib-9.6' )
                 fi
                 echo "-------------------------------------------------------------------------------";
                 cecho y "Installing Ishtar dependencies"
-- 
cgit v1.2.3


From 5044800d1fca5650198e88ccc1ee6a97954c1748 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 5 Nov 2018 22:34:00 +0100
Subject: Settings: specific handler for DisallowHost

---
 example_project/settings.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/example_project/settings.py b/example_project/settings.py
index a76134746..89df18c2a 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -211,6 +211,10 @@ LOGGING = {
             'level': 'INFO',
             'propagate': False,
         },
+        'django.security.DisallowedHost': {
+            'handlers': ['logfile'],
+            'propagate': False,
+        },
         'ishtar_pdl': default_handler,
         'ishtar_common': default_handler,
         'archaeological_files_pdl': default_handler,
-- 
cgit v1.2.3