-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Fixes: #4930] Remove Edit Data button for RASTER layer #5035
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #5035 +/- ##
=======================================
Coverage 59.71% 59.71%
=======================================
Files 234 234
Lines 12541 12541
Branches 1834 1834
=======================================
Hits 7489 7489
Misses 4421 4421
Partials 631 631 |
capooti
approved these changes
Oct 11, 2019
thanks @t-book |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport 2.10.x
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 405a528b63288fb5d65055caef7c0d29d0b2bc75
# Create a new branch with these backported commits.
git checkout -b backport-5035-to-2.10.x
# Push it to GitHub.
git push --set-upstream origin backport-5035-to-2.10.x
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport Then, create a pull request where the |
afabiani
pushed a commit
that referenced
this pull request
Oct 14, 2019
kikislater
added a commit
to giscan/geonode
that referenced
this pull request
Nov 19, 2019
* [Fixes GeoNode#4949] UnicodeEncodeError in upload.models.update_from_session [Fixes GeoNode#4949] UnicodeEncodeError in upload.models.update_from_session * Update httplib2 requirement from <0.13.2 to <0.14.1 Updates the requirements on [httplib2](https://github.com/httplib2/httplib2) to permit the latest version. - [Release notes](https://github.com/httplib2/httplib2/releases) - [Changelog](https://github.com/httplib2/httplib2/blob/master/CHANGELOG) - [Commits](httplib2/httplib2@0.9...v0.14.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * Use Tomcat 8.5.46 Apache Tomcat 8.5 is updated to v8.5.46 * [Fixes GeoNode#4959] By using UPLOADER=geonode.rest we are facing a timing issues on signals - Fix test cases * [Fixes GeoNode#4964] Date widget has gone * [Docs] update geonode-project setup instructions * Bump kombu from 4.6.4 to 4.6.5 Bumps [kombu](https://kombu.readthedocs.io) from 4.6.4 to 4.6.5. Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump amqp from 2.5.1 to 2.5.2 Bumps [amqp](https://github.com/celery/py-amqp) from 2.5.1 to 2.5.2. - [Release notes](https://github.com/celery/py-amqp/releases) - [Changelog](https://github.com/celery/py-amqp/blob/master/Changelog) - [Commits](celery/py-amqp@2.5.1...2.5.2) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Docs] update geonode-project setup instructions * Bump django from 1.11.24 to 1.11.25 Bumps [django](https://github.com/django/django) from 1.11.24 to 1.11.25. - [Release notes](https://github.com/django/django/releases) - [Commits](django/django@1.11.24...1.11.25) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump pillow from 6.1.0 to 6.2.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 6.1.0 to 6.2.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](python-pillow/Pillow@6.1.0...6.2.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Docs] Updating installation instructions for GeoNode Project * Adding "sjohn-atenekom" to the authorized list of users * [Fixes GeoNode#4990] fix set_layers_permissions managament command * Bump docker from 4.0.2 to 4.1.0 Bumps [docker](https://github.com/docker/docker-py) from 4.0.2 to 4.1.0. - [Release notes](https://github.com/docker/docker-py/releases) - [Commits](docker/docker-py@4.0.2...4.1.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Hardening] Make master more resilient to errors - Optimize Thumbnail ratio - sync_geonode_layers defaulting to False [Fixes GeoNode#4976] Auxiliary file not uploaded to Geoserver with geonode.importer * [Fixes: 4988] Rework static build process (GeoNode#4989) * updated gruntfile, excluded dependencies, updated package.json * new /static/lib build * new static/geonode build * updated templates for static file include (DEBUG_STATIC) * updated settings for leaflet * removed bower * fixed typo * updated uglify dev * updated dependencies * new static build * last tests * [Backport 2.10.x] [Fixes GeoNode#4954] only needed attributes added to cookie, when adding layer to cart (GeoNode#4998) * only add relevant info to cookie item, when adding to cart * removed blank lines * [Fixes: GeoNode#5000] Update Frontend section * - Add 'spatialreference.org' to default settings * [Hardening] - Get rid of redoundant/unuseful methods * [Hardening] http_client caching requests * [Revert][Hardening] http_client caching requests * Bump setuptools from 41.2.0 to 41.4.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 41.2.0 to 41.4.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/master/CHANGES.rst) - [Commits](pypa/setuptools@v41.2.0...v41.4.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump pytz from 2019.2 to 2019.3 Bumps [pytz](https://github.com/stub42/pytz) from 2019.2 to 2019.3. - [Release notes](https://github.com/stub42/pytz/releases) - [Commits](stub42/pytz@release_2019.2...release_2019.3) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump django-geonode-mapstore-client from 1.4.2 to 1.4.3 Bumps [django-geonode-mapstore-client](https://github.com/GeoNode/geonode-mapstore-client) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/GeoNode/geonode-mapstore-client/releases) - [Changelog](https://github.com/GeoNode/geonode-mapstore-client/blob/master/CHANGELOG.md) - [Commits](GeoNode/geonode-mapstore-client@v1.4.2...1.4.3) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump beautifulsoup4 from 4.8.0 to 4.8.1 Bumps [beautifulsoup4](http://www.crummy.com/software/BeautifulSoup/bs4/) from 4.8.0 to 4.8.1. Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump sqlalchemy from 1.3.8 to 1.3.9 Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 1.3.8 to 1.3.9. - [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases) - [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/master/CHANGES) - [Commits](https://github.com/sqlalchemy/sqlalchemy/commits) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump django-mapstore-adapter from 1.0.8 to 1.0.9 Bumps [django-mapstore-adapter](https://github.com/GeoNode/django-mapstore-adapter) from 1.0.8 to 1.0.9. - [Release notes](https://github.com/GeoNode/django-mapstore-adapter/releases) - [Changelog](https://github.com/GeoNode/django-mapstore-adapter/blob/master/CHANGELOG.md) - [Commits](GeoNode/django-mapstore-adapter@v1.0.8...1.0.9) Signed-off-by: dependabot-preview[bot] <[email protected]> * Adding LiliGuimaraes to CLA * [Documentation] LDAP Contrib Module Documentation * [Hardening] Cleanup unneeded deps * [Documentation] Backporting GeoNode/GeoServer AA Sections * [Documentation] Backporting GeoNode/GeoServer AA Sections - update GeoFence db config * [Documentation] Loading (and Processing) external data / importlayers and updatelayers Management Commands * Fixes GeoNode#5005 * Bump django-geonode-mapstore-client from 1.4.3 to 1.4.4 Bumps [django-geonode-mapstore-client](https://github.com/GeoNode/geonode-mapstore-client) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/GeoNode/geonode-mapstore-client/releases) - [Changelog](https://github.com/GeoNode/geonode-mapstore-client/blob/master/CHANGELOG.md) - [Commits](GeoNode/geonode-mapstore-client@1.4.3...1.4.4) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump sqlalchemy from 1.3.9 to 1.3.10 Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 1.3.9 to 1.3.10. - [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases) - [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/master/CHANGES) - [Commits](https://github.com/sqlalchemy/sqlalchemy/commits) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump python-slugify from 3.0.4 to 3.0.6 Bumps [python-slugify](https://github.com/un33k/python-slugify) from 3.0.4 to 3.0.6. - [Release notes](https://github.com/un33k/python-slugify/releases) - [Changelog](https://github.com/un33k/python-slugify/blob/master/CHANGELOG.md) - [Commits](un33k/python-slugify@3.0.4...3.0.6) Signed-off-by: dependabot-preview[bot] <[email protected]> * Remove plusone (Closes GeoNode#4929) * GeoNode#4930 Remove Edit Data button for RASTER layer (GeoNode#5035) * Bump pytest from 4.6.5 to 4.6.6 Bumps [pytest](https://github.com/pytest-dev/pytest) from 4.6.5 to 4.6.6. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst) - [Commits](pytest-dev/pytest@4.6.5...4.6.6) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Hardening] Fix backup/restore GeoServer rest endpoints * GeoNode#5054 | 5053 Update Translations * fix flake8 issue with _ * Update gnip.md * - Hide "private" groups to "non-members" - Add the concept of "Active Members" group * [Documentation] Add "OAUTH2_API_KEY" setting to the settings list (cherry picked from commit bee9e08) * Bump pytest-django from 3.5.1 to 3.6.0 Bumps [pytest-django](https://github.com/pytest-dev/pytest-django) from 3.5.1 to 3.6.0. - [Release notes](https://github.com/pytest-dev/pytest-django/releases) - [Changelog](https://github.com/pytest-dev/pytest-django/blob/master/docs/changelog.rst) - [Commits](pytest-dev/pytest-django@v3.5.1...v3.6.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Fixes GeoNode#5031] Disable monitoring by default * [Fixes GeoNode#4956] "Original Dataset" Link behavior improvements * [Fixes GeoNode#4942] Download layer filter not sending CQL filter anymore * [Hardening] A bit more robust logical check (cherry picked from commit 48940dc) * [Hardening] Original Dataset link: skip checks for external links (cherry picked from commit 3cac72d) * [Hardening] A bit more robust logical check (cherry picked from commit 8922cb7) * [Fixes GeoNode#5051] arrangement for geonode_logstash contrib app * [Fixes: GeoNode#4659] Double message on Submit invite users * [Hardening] coverage run integration tests too (cherry picked from commit 4f86f69) * [Hardening] coverage run integration tests too (cherry picked from commit b3c7dcf) * [Hardening] coverage run integration tests too (cherry picked from commit 7a2fc09) * [Hardening] coverage run integration tests too (cherry picked from commit 6054cb2) * [Fixes GeoNode#5070] Add Bing background layer config to MapStore2 adapter if apiKey is provided * [Fixes GeoNode#5073] Update install docs (cherry picked from commit 17cc5c7) * [Fixes GeoNode#5073] Added blank line (cherry picked from commit 0bb703c) * [Testing] Code Coverage (cherry picked from commit 3c81043) * Bump to version 2.10.1 (cherry picked from commit 7dd54dc) # Conflicts: # Dockerfile # docker-compose.async.yml # docker-compose.yml * [Testing] Code Coverage (cherry picked from commit 9e63d26) # Conflicts: # .travis.yml * Bump django-leaflet from 0.24.0 to 0.25.0 Bumps [django-leaflet](https://github.com/makinacorpus/django-leaflet) from 0.24.0 to 0.25.0. - [Release notes](https://github.com/makinacorpus/django-leaflet/releases) - [Changelog](https://github.com/makinacorpus/django-leaflet/blob/master/CHANGES) - [Commits](makinacorpus/django-leaflet@0.24.0...0.25.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump django-celery-beat from 1.1.1 to 1.5.0 Bumps [django-celery-beat](https://github.com/celery/django-celery-beat) from 1.1.1 to 1.5.0. - [Release notes](https://github.com/celery/django-celery-beat/releases) - [Changelog](https://github.com/celery/django-celery-beat/blob/master/Changelog) - [Commits](celery/django-celery-beat@v1.1.1...1.5.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump psycopg2 from 2.8.3 to 2.8.4 Bumps [psycopg2](https://github.com/psycopg/psycopg2) from 2.8.3 to 2.8.4. - [Release notes](https://github.com/psycopg/psycopg2/releases) - [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS) - [Commits](https://github.com/psycopg/psycopg2/commits) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump python-slugify from 3.0.6 to 4.0.0 Bumps [python-slugify](https://github.com/un33k/python-slugify) from 3.0.6 to 4.0.0. - [Release notes](https://github.com/un33k/python-slugify/releases) - [Changelog](https://github.com/un33k/python-slugify/blob/master/CHANGELOG.md) - [Commits](un33k/python-slugify@3.0.6...4.0.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Testing] Code Coverage / CHANGELOG updates (cherry picked from commit ebf16f4) * Update index.html fixes GeoNode#5089 * Bump pillow from 6.2.0 to 6.2.1 Bumps [pillow](https://github.com/python-pillow/Pillow) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](python-pillow/Pillow@6.2.0...6.2.1) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Fixes GeoNode#5096] Disabling geonode.monitoring causes model exceptions on views * Update settings.py * [Fixes GeoNode#4827] Line layer uploaded to GeoNode is rendered as point layer * [Documentation] Fixed typo goenode to geonode (cherry picked from commit fef9d16) * [Documentation] Fixed .env docker description for geonode-project (cherry picked from commit 83b805f) * Enable thesauri api load only if a thesauri is defined * Update django-floppyforms requirement from <=1.7.0 to <1.9.0 Updates the requirements on [django-floppyforms](https://github.com/jazzband/django-floppyforms) to permit the latest version. - [Release notes](https://github.com/jazzband/django-floppyforms/releases) - [Changelog](https://github.com/jazzband/django-floppyforms/blob/master/CHANGES.rst) - [Commits](jazzband/django-floppyforms@0.1...1.8.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Fixes GeoNode#4827] Line layer uploaded to GeoNode is rendered as point layer * [Fixes GeoNode#5121] ResourceBase API returns an error if a curated thumbnail img file is not existing anymore * Update django-modeltranslation requirement Updates the requirements on [django-modeltranslation](https://github.com/deschler/django-modeltranslation) to permit the latest version. - [Release notes](https://github.com/deschler/django-modeltranslation/releases) - [Changelog](https://github.com/deschler/django-modeltranslation/blob/master/CHANGELOG.txt) - [Commits](deschler/django-modeltranslation@0.11...0.13.4) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump decorator from 4.4.0 to 4.4.1 Bumps [decorator](https://github.com/micheles/decorator) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/micheles/decorator/releases) - [Changelog](https://github.com/micheles/decorator/blob/master/CHANGES.md) - [Commits](https://github.com/micheles/decorator/commits) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump setuptools from 41.4.0 to 41.5.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 41.4.0 to 41.5.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/master/CHANGES.rst) - [Commits](pypa/setuptools@v41.4.0...v41.5.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Fixes GeoNode#5117] Publishing layers of two remote services with same * [Fixes GeoNode#5137] Striptags for service resources * [Fixes GeoNode#5138] Escape Hierarchical-tags * [Fixes GeoNode#5138] Fix Flake8 * Bump setuptools from 41.5.0 to 41.5.1 Bumps [setuptools](https://github.com/pypa/setuptools) from 41.5.0 to 41.5.1. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/master/CHANGES.rst) - [Commits](pypa/setuptools@v41.5.0...v41.5.1) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump flake8 from 3.7.8 to 3.7.9 Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.7.8 to 3.7.9. - [Release notes](https://gitlab.com/pycqa/flake8/tags) - [Commits](https://gitlab.com/pycqa/flake8/compare/3.7.8...3.7.9) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Fixes GeoNode#5138] Fix blank space * [Fixes GeoNode#5138] Fix assertation error * [Implements GeoNode#5149] Add documentation for migrating GeoNode from 2.4 to 2.10.1 * [Fixes GeoNode#5136] Assignment of users to member groups should be done at activation time * [Docs] Cleaning up misleading instructions (cherry picked from commit 7f0ad22) * [Fixes GeoNode#5105] Error when using THESAURI * Bump setuptools from 41.5.1 to 41.6.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 41.5.1 to 41.6.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/master/CHANGES.rst) - [Commits](pypa/setuptools@v41.5.1...v41.6.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * Mitigates possibilities for error GeoNode#2932 * [Fixes GeoNode#5172] Add docs for thesaurus * [Fixes GeoNode#5172] Add fix for import thesaurus * Bump tqdm from 4.36.1 to 4.37.0 Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.36.1 to 4.37.0. - [Release notes](https://github.com/tqdm/tqdm/releases) - [Commits](tqdm/tqdm@v4.36.1...v4.37.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Fixes GeoNode#4661] Replace Layer functionality incomplete/broken # Conflicts: # geonode/layers/utils.py * Merge branch 'master' of https://github.com/GeoNode/geonode into ISSUE_4661 * Changed wrong words in French version * [Fixes GeoNode#5181] Wrong words in French translation * Bump python-dateutil from 2.8.0 to 2.8.1 Bumps [python-dateutil](https://github.com/dateutil/dateutil) from 2.8.0 to 2.8.1. - [Release notes](https://github.com/dateutil/dateutil/releases) - [Changelog](https://github.com/dateutil/dateutil/blob/master/NEWS) - [Commits](dateutil/dateutil@2.8.0...2.8.1) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump django from 1.11.25 to 1.11.26 Bumps [django](https://github.com/django/django) from 1.11.25 to 1.11.26. - [Release notes](https://github.com/django/django/releases) - [Commits](django/django@1.11.25...1.11.26) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump psutil from 5.6.3 to 5.6.4 Bumps [psutil](https://github.com/giampaolo/psutil) from 5.6.3 to 5.6.4. - [Release notes](https://github.com/giampaolo/psutil/releases) - [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst) - [Commits](giampaolo/psutil@release-5.6.3...release-5.6.4) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Fixes GeoNode#5158] Update thesaurus management command and fix autocomplete * Merge branch 'master' of https://github.com/GeoNode/geonode into ISSUE_5158 * - Fixes "field" rendering error when Thesauri have been enabled * Merge branch 'master' of https://github.com/GeoNode/geonode into ISSUE_5158 * - _resourcebase_info_panel is showing the tkeywords only if THESAURUS is enabled and adding commas between words * fixes GeoNode#5197 added __unicode__ functions for menu and menu items * fixed pep8 errors ``` flake8 geonode geonode/base/models.py:1361:5: E301 expected 1 blank line, found 0 geonode/base/models.py:1422:1: W293 blank line contains whitespace ``` are fixed * Bump psutil from 5.6.4 to 5.6.5 Bumps [psutil](https://github.com/giampaolo/psutil) from 5.6.4 to 5.6.5. - [Release notes](https://github.com/giampaolo/psutil/releases) - [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst) - [Commits](giampaolo/psutil@release-5.6.4...release-5.6.5) Signed-off-by: dependabot-preview[bot] <[email protected]> * Update six requirement from <1.11.0 to <1.14.0 Updates the requirements on [six](https://github.com/benjaminp/six) to permit the latest version. - [Release notes](https://github.com/benjaminp/six/releases) - [Changelog](https://github.com/benjaminp/six/blob/master/CHANGES) - [Commits](benjaminp/six@1.0.0b1...1.13.0) Signed-off-by: dependabot-preview[bot] <[email protected]> - Fix build * [Fixes GeoNode#5203] avoid count label in countries, add missing flags * [Hardening] layer_detail typo (cherry picked from commit 2e3a117) * [Fixes GeoNode#5209] MapStore client critical slow-down with latest Chrome updates * [Fixes GeoNode#5214] Fix regression on monitoring countries endpoint * added unicode tests for Menu, MenuItem and MenuPlaceholder * Bump kombu from 4.6.5 to 4.6.6 Bumps [kombu](https://kombu.readthedocs.io) from 4.6.5 to 4.6.6. Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump twisted from 19.7.0 to 19.10.0 Bumps [twisted](https://github.com/twisted/twisted) from 19.7.0 to 19.10.0. - [Release notes](https://github.com/twisted/twisted/releases) - [Changelog](https://github.com/twisted/twisted/blob/trunk/NEWS.rst) - [Commits](twisted/twisted@twisted-19.7.0...twisted-19.10.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump django-mapstore-adapter from 1.0.11 to 1.0.12 Bumps [django-mapstore-adapter](https://github.com/GeoNode/django-mapstore-adapter) from 1.0.11 to 1.0.12. - [Release notes](https://github.com/GeoNode/django-mapstore-adapter/releases) - [Changelog](https://github.com/GeoNode/django-mapstore-adapter/blob/master/CHANGELOG.md) - [Commits](GeoNode/django-mapstore-adapter@1.0.11...1.0.12) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump amqp from 2.5.1 to 2.5.2 Bumps [amqp](https://github.com/celery/py-amqp) from 2.5.1 to 2.5.2. - [Release notes](https://github.com/celery/py-amqp/releases) - [Changelog](https://github.com/celery/py-amqp/blob/master/Changelog) - [Commits](celery/py-amqp@2.5.1...2.5.2) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump tqdm from 4.37.0 to 4.38.0 Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.37.0 to 4.38.0. - [Release notes](https://github.com/tqdm/tqdm/releases) - [Commits](tqdm/tqdm@v4.37.0...v4.38.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Fixes GeoNode#5223] Layer details broken if no store identified # Conflicts: # requirements.txt * Bump pytest-django from 3.6.0 to 3.7.0 Bumps [pytest-django](https://github.com/pytest-dev/pytest-django) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/pytest-dev/pytest-django/releases) - [Changelog](https://github.com/pytest-dev/pytest-django/blob/master/docs/changelog.rst) - [Commits](pytest-dev/pytest-django@v3.6.0...v3.7.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump sqlalchemy from 1.3.10 to 1.3.11 Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 1.3.10 to 1.3.11. - [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases) - [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/master/CHANGES) - [Commits](https://github.com/sqlalchemy/sqlalchemy/commits) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump deprecated from 1.2.6 to 1.2.7 Bumps [deprecated](https://github.com/tantale/deprecated) from 1.2.6 to 1.2.7. - [Release notes](https://github.com/tantale/deprecated/releases) - [Changelog](https://github.com/tantale/deprecated/blob/master/CHANGELOG.rst) - [Commits](laurent-laporte-pro/deprecated@v1.2.6...v1.2.7) Signed-off-by: dependabot-preview[bot] <[email protected]> * Bump urllib3 from 1.25.6 to 1.25.7 Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.6 to 1.25.7. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/master/CHANGES.rst) - [Commits](urllib3/urllib3@1.25.6...1.25.7) Signed-off-by: dependabot-preview[bot] <[email protected]> * - Bump to version 2.10.1 (cherry picked from commit 98d7adc) * - Bump to version 2.10.2 * - Fix build (cherry picked from commit 4a7dc67) * Bump readthedocs-sphinx-ext from 1.0.0 to 1.0.1 Bumps [readthedocs-sphinx-ext](https://github.com/readthedocs/readthedocs-sphinx-ext) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/readthedocs/readthedocs-sphinx-ext/releases) - [Commits](readthedocs/readthedocs-sphinx-ext@1.0...1.0.1) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Fixes GeoNode#5258] Duplicate Headline in /about deleted about GeoNode duplicate in template * [Fixes GeoNode#5264] Use GeoServer 2.15.3 * [Fixes GeoNode#4635] Encoding issues when uploading layers using a shapefile * Update django-modeltranslation requirement Updates the requirements on [django-modeltranslation](https://github.com/deschler/django-modeltranslation) to permit the latest version. - [Release notes](https://github.com/deschler/django-modeltranslation/releases) - [Changelog](https://github.com/deschler/django-modeltranslation/blob/master/CHANGELOG.txt) - [Commits](deschler/django-modeltranslation@0.11...0.14.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * [Fixes GeoNode#5272] Line layer uploaded to GeoNode is rendered as point layer * [Hardening] fixup Legend links (cherry picked from commit 012ac64) * [Hardening] fixup Legend links (cherry picked from commit bbc8fe3) * Fix GeoNode#5260 Failed to get the certificates * Bump simplejson from 3.16.0 to 3.17.0 Bumps [simplejson](https://github.com/simplejson/simplejson) from 3.16.0 to 3.17.0. - [Release notes](https://github.com/simplejson/simplejson/releases) - [Changelog](https://github.com/simplejson/simplejson/blob/master/CHANGES.txt) - [Commits](simplejson/simplejson@v3.16.0...v3.17.0) Signed-off-by: dependabot-preview[bot] <[email protected]> (cherry picked from commit 07f38c5) * Bump pyopenssl from 19.0.0 to 19.1.0 Bumps [pyopenssl](https://github.com/pyca/pyopenssl) from 19.0.0 to 19.1.0. - [Release notes](https://github.com/pyca/pyopenssl/releases) - [Changelog](https://github.com/pyca/pyopenssl/blob/master/CHANGELOG.rst) - [Commits](pyca/pyopenssl@19.0.0...19.1.0) Signed-off-by: dependabot-preview[bot] <[email protected]> (cherry picked from commit cee3b98) * [Fixes GeoNode#5283] UnicodeEncodeError when trying to delete a Layer on a GeoNode instance with action streams containing exotic characters. (cherry picked from commit 721562c) * Merge pull request GeoNode#5287 from GeoNode/GNIP_71 [Fixes GeoNode#5274] GNIP 71 - Layer Set Permissions Admin Dashboard (cherry picked from commit 16ffcdf)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I have chosen
if layer_type != "raster"
overif layer_type == "vector"
as I do not know if there are other types (next to vector) to consider.[Fixes: #4930]
[Closes: #4930]
Checklist
For all pull requests:
The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):
Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.