Merge branch 'release/7.0.0'

Author: marteinn

.github/workflows/main.yml

@@ -7,12 +7,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         wagtail-version:
           - 2.15.5
-          - 2.16.2
-          - 3.0.1
+          - 2.16.3
+          - 3.0.3
           - 4.0.4
+          - 4.1.1
+        exclude:
+          - python-version: "3.11"
+            wagtail-version: "2.15.5"
+          - python-version: "3.11"
+            wagtail-version: "2.16.3"
+          - python-version: "3.11"
+            wagtail-version: "3.0.3"
+          - python-version: "3.11"
+            wagtail-version: "4.0.4"
     services:
       postgres:
         image: postgis/postgis:12-2.5

CHANGELOG.md

@@ -1,19 +1,34 @@
 # Changelog
 
-## Unreleased
+## [Unreleased]
+### Added
+### Changed
+### Fixed
+### Removed
+
+## [7.0.0] - 2022.12.03
 ### Added
 - Add Wagtail 4 compability (@katdom13)
+- Add contribution documentation (@marteinn)
 
 ### Changed
-- Updated StreamFieldPanel to just FieldPanel in tests (@katdom13)
-- Updated StreamFields to have additional argument use_json_field
-- Renamed wagtailgeowidget.edit_handlers to wagtailgeowidget.panels
-- Updated imports in docs (@katdom13)
+- Update StreamFieldPanel to just FieldPanel in tests (@katdom13)
+- Update StreamFields to have additional argument use_json_field in test (@katdom13)
+- Rename wagtailgeowidget.edit_handlers to wagtailgeowidget.panels (@katdom13)
+- Update imports in docs (@katdom13)
+
+### Fixed
+- Ensure setup() is only called after user focus if showEmptyLocation is true (@kleingeist)
+- Add support for permissions on field panels (@unicode-it)
+
+### Breaking changes
+- `wagtailgeowidget.edit_handlers` has been renamed to `wagtailgeowidget.panels`
 
 
 ## [6.2.0] - 2022.07.03
 ### Added
 - Add Wagtail 3 compability (@marteinn)
+- Add French translations (@ThbtSprt)
 
 ### Changed
 - Make GEO_WIDGET_EMPTY_LOCATION False by default (@marteinn)

README.md

@@ -37,6 +37,7 @@ If you have ideas for improvement, please share your thoughts through an issue.
 
 - Issue Tracker: [https://github.com/Frojd/wagtail-geo-widget/issues](https://github.com/Frojd/wagtail-geo-widget/issues)
 - Source Code: [https://github.com/Frojd/wagtail-geo-widget](https://github.com/Frojd/wagtail-geo-widget)
+- [Contribution documentation](https://github.com/Frojd/wagtail-geo-widget/blob/main/docs/contributing.md)
 
 
 ## Security

docs/contributing.md

@@ -0,0 +1,21 @@
+# Contributing
+
+## General
+- This project uses git flow, any pull request should be based on the `develop` branch
+- Commits should follow the recommendations mentioned at https://cbea.ms/git-commit/ (TLDR; Use present tense)
+
+## Requirements
+- docker
+- A working Google Maps API Key
+
+## Instruction
+- Run `docker-compose up`
+- Open [http://localhost:8085](http://localhost:8085)
+
+## Testing
+- Make sure you perform interface testing by going through the page models from `tests` and make sure they all behave as expected in the Wagtail interface
+- Run the test suite
+
+## Commiting
+- Make sure your code are formatted using black
+- Update `CHANGELOG.md` with your changes

setup.py

@@ -58,6 +58,7 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Utilities",
     ],
     extras_require={"test": test_extras},

wagtailgeowidget/__init__.py

@@ -7,8 +7,8 @@
 """
 
 __title__ = "wagtailgeowidget"
-__version__ = "6.2.0"
-__build__ = 620
+__version__ = "7.0.0"
+__build__ = 700
 __author__ = "Martin Sandström"
 __license__ = "MIT"
 __copyright__ = "Copyright 2015-Present Fröjd Interactive"

wagtailgeowidget/panels.py

@@ -42,12 +42,11 @@ def widget_overrides(self):
 
     def clone(self):
         return self.__class__(
-            field_name=self.field_name,
-            classname=self.classname,
             address_field=self.address_field,
             zoom_field=self.zoom_field,
             hide_latlng=self.hide_latlng,
             zoom=self.zoom,
+            **self.clone_kwargs(),
         )
 
 
@@ -83,8 +82,8 @@ def widget_overrides(self):
 
     def clone(self):
         return self.__class__(
-            field_name=self.field_name,
             geocoder=self.geocoder,
+            **self.clone_kwargs(),
         )
 
 
@@ -120,10 +119,9 @@ def widget_overrides(self):
 
     def clone(self):
         return self.__class__(
-            field_name=self.field_name,
-            classname=self.classname,
             address_field=self.address_field,
             zoom_field=self.zoom_field,
             hide_latlng=self.hide_latlng,
             zoom=self.zoom,
+            **self.clone_kwargs(),
         )

wagtailgeowidget/static/wagtailgeowidget/js/leaflet-field.js

@@ -45,8 +45,6 @@ function LeafletField(options) {
     } else {
         this.setup();
     }
-
-    this.setup();
 }
 
 LeafletField.prototype.setup = function () {