Merge pull request #85 from neogeo-technologies/develop

v1.2.0

.gitignore

@@ -95,3 +95,6 @@ config/settings.py
 config/wsgi.py
 config/__init__.py
 /docker/nginx/conf.d/geocontrib.conf
+
+# MacOS
+.DS_Store

CHANGELOG.md

@@ -5,6 +5,28 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+## [1.2.0] - 2020-12-17
+
+### Changed
+- Redmine 9704: Allow the management of feature links in Django admin
+- Redmine 8551: Can import features files with extention "geojson" in addition to "json"
+- Redmine 9330: A feature type can be duplicated
+- Redmine 9329: Can turn a project into a project template and instatiate a project from a project model
+- Django admin improvements
+  - Projects list ordered by title
+  - FeatureType list ordered by project, title
+  - FeatureType list grouped by project
+  - Users list ordered by username, last_name, first_name
+  - FeatureType geom editable on create (read-only on update)
+  - CustomField list ordered by feature_type, label
+  - Project creator required (fixing 500 on edit)
+
+### Fixed
+- Docker, prevent creating files not readable by nginx
+- Redmine 9706: The modification of the basemap form are recorded
+- Redmine 9654: Creating a basemap without title doesn't crash
+- Redmine 9623: A connected user doesn't see achived features if he is not allowed
+
 ## [1.1.3] - 2020-11-13
 
 ### Changed

api/serializers.py

@@ -248,7 +248,7 @@ def get_feature_type_url(self, obj):
             kwargs={
                 'slug': obj.project.slug,
                 'feature_type_slug': obj.feature_type.slug
-        })
+            })
 
 
 class FeatureLinkSerializer(serializers.ModelSerializer):
@@ -261,7 +261,7 @@ def get_feature_to(self, obj):
         res = {}
         if obj.feature_to:
             try:
-                feature = Feature.objects.get(feature_id=obj.feature_to)
+                feature = obj.feature_to
                 res = {
                     'feature_id': str(feature.feature_id),
                     'title': str(feature.title),

config_sample/settings.py

@@ -222,4 +222,18 @@
 # Active geocoder
 SELECTED_GEOCODER = {
     'PROVIDER': config('SELECTED_GEOCODER_PROVIDER', default='addok')
-}
+}
+
+# Project duplication settings
+PROJECT_COPY_RELATED = {
+    'AUTHORIZATION': True,
+    'BASE_MAP': True,
+    'FEATURE': True,
+    'FEATURE_TYPE': True,
+    'THUMBNAIL': True,
+}
+
+DATA_UPLOAD_MAX_NUMBER_FIELDS = config('DATA_UPLOAD_MAX_NUMBER_FIELDS', default=10000)
+
+# 9745 & 9645 don't create temp files with 0o000
+FILE_UPLOAD_PERMISSIONS = 0o644

docker/geocontrib/settings.py

@@ -158,13 +158,13 @@
 }
 
 # E-mail and notification parameters
-# EMAIL_BACKEND = config('EMAIL_BACKEND', default="django.core.mail.backends.console.EmailBackend")
-# EMAIL_HOST = config('EMAIL_HOST')
-# EMAIL_HOST_USER = config('EMAIL_HOST_USER')
-# EMAIL_HOST_PASSWORD = config('EMAIL_HOST_PASSWORD')
-# EMAIL_PORT = config('EMAIL_PORT', cast=int)
-# EMAIL_USE_TLS = config('EMAIL_USE_TLS', cast=bool)
-# DEFAULT_FROM_EMAIL = config('DEFAULT_FROM_EMAIL')
+EMAIL_BACKEND = config('EMAIL_BACKEND', default="django.core.mail.backends.console.EmailBackend")
+EMAIL_HOST = config('EMAIL_HOST')
+EMAIL_HOST_USER = config('EMAIL_HOST_USER')
+EMAIL_HOST_PASSWORD = config('EMAIL_HOST_PASSWORD')
+EMAIL_PORT = config('EMAIL_PORT', cast=int)
+EMAIL_USE_TLS = config('EMAIL_USE_TLS', cast=bool)
+DEFAULT_FROM_EMAIL = config('DEFAULT_FROM_EMAIL')
 
 # Notification frequency (allowed values: 'never', 'instantly', 'daily', 'weekly')
 DEFAULT_SENDING_FREQUENCY = config('DEFAULT_SENDING_FREQUENCY', default='never')
@@ -212,3 +212,7 @@
 }
 
 DATA_UPLOAD_MAX_NUMBER_FIELDS = config('DATA_UPLOAD_MAX_NUMBER_FIELDS', default=10000)
+
+# 9745 & 9645 don't create temp files with 0o000
+FILE_UPLOAD_PERMISSIONS = 0o644
+

geocontrib/admin/__init__.py

@@ -0,0 +1,4 @@
+from geocontrib.admin.feature import *
+from geocontrib.admin.flat_page import *
+from geocontrib.admin.project import *
+from geocontrib.admin.user import *