Skip to content
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 #6596] Incorrect Legend displayed in the layer detail page #6597

Merged
merged 2 commits into from
Nov 3, 2020

Conversation

afabiani
Copy link
Member

@afabiani afabiani commented Oct 30, 2020

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

For all pull requests:

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in the documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemption is, changes not visible to end-users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • New unit tests have been added covering the changes, unless there is an explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates

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.

@afabiani afabiani added this to the 3.1 milestone Oct 30, 2020
@afabiani afabiani self-assigned this Oct 30, 2020
@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Oct 30, 2020
@lgtm-com
Copy link

lgtm-com bot commented Oct 30, 2020

This pull request fixes 1 alert when merging 0aa6902 into 5cf83ad - view on LGTM.com

fixed alerts:

  • 1 for Unreachable code

@lgtm-com
Copy link

lgtm-com bot commented Oct 31, 2020

This pull request introduces 1 alert and fixes 1 when merging 718679b into 5cf83ad - view on LGTM.com

new alerts:

  • 1 for Module is imported with 'import' and 'import from'

fixed alerts:

  • 1 for Unreachable code

@lgtm-com
Copy link

lgtm-com bot commented Nov 1, 2020

This pull request introduces 8 alerts and fixes 18 when merging 0994528 into 5cf83ad - view on LGTM.com

new alerts:

  • 4 for Wrong number of arguments in a class instantiation
  • 2 for Mismatch between signature and use of an overriding method
  • 2 for Wrong number of arguments in a call

fixed alerts:

  • 5 for Module-level cyclic import
  • 5 for First argument to super() is not enclosing class
  • 4 for Missing call to __init__ during object initialization
  • 2 for Modification of parameter with default
  • 1 for Too few arguments in formatting call
  • 1 for Unreachable code

@lgtm-com
Copy link

lgtm-com bot commented Nov 1, 2020

This pull request fixes 18 alerts when merging 480f1e1 into 5cf83ad - view on LGTM.com

fixed alerts:

  • 5 for Module-level cyclic import
  • 5 for First argument to super() is not enclosing class
  • 4 for Missing call to __init__ during object initialization
  • 2 for Modification of parameter with default
  • 1 for Too few arguments in formatting call
  • 1 for Unreachable code

@lgtm-com
Copy link

lgtm-com bot commented Nov 1, 2020

This pull request fixes 18 alerts when merging e03ccb1 into 5cf83ad - view on LGTM.com

fixed alerts:

  • 5 for Module-level cyclic import
  • 5 for First argument to super() is not enclosing class
  • 4 for Missing call to __init__ during object initialization
  • 2 for Modification of parameter with default
  • 1 for Too few arguments in formatting call
  • 1 for Unreachable code

@lgtm-com
Copy link

lgtm-com bot commented Nov 1, 2020

This pull request fixes 18 alerts when merging 9c4ee42 into 5cf83ad - view on LGTM.com

fixed alerts:

  • 5 for Module-level cyclic import
  • 5 for First argument to super() is not enclosing class
  • 4 for Missing call to __init__ during object initialization
  • 2 for Modification of parameter with default
  • 1 for Too few arguments in formatting call
  • 1 for Unreachable code

@lgtm-com
Copy link

lgtm-com bot commented Nov 1, 2020

This pull request fixes 18 alerts when merging 63739f6 into 5cf83ad - view on LGTM.com

fixed alerts:

  • 5 for Module-level cyclic import
  • 5 for First argument to super() is not enclosing class
  • 4 for Missing call to __init__ during object initialization
  • 2 for Modification of parameter with default
  • 1 for Too few arguments in formatting call
  • 1 for Unreachable code

@afabiani afabiani force-pushed the ISSUE_6596 branch 2 times, most recently from 06e24f6 to b442016 Compare November 1, 2020 15:46
@lgtm-com
Copy link

lgtm-com bot commented Nov 1, 2020

This pull request fixes 18 alerts when merging b442016 into 5cf83ad - view on LGTM.com

fixed alerts:

  • 5 for Module-level cyclic import
  • 5 for First argument to super() is not enclosing class
  • 4 for Missing call to __init__ during object initialization
  • 2 for Modification of parameter with default
  • 1 for Too few arguments in formatting call
  • 1 for Unreachable code

@afabiani afabiani force-pushed the ISSUE_6596 branch 6 times, most recently from 70ad77b to a44b8b9 Compare November 1, 2020 17:43
@lgtm-com
Copy link

lgtm-com bot commented Nov 1, 2020

This pull request fixes 18 alerts when merging a44b8b9 into 5cf83ad - view on LGTM.com

fixed alerts:

  • 5 for Module-level cyclic import
  • 5 for First argument to super() is not enclosing class
  • 4 for Missing call to __init__ during object initialization
  • 2 for Modification of parameter with default
  • 1 for Too few arguments in formatting call
  • 1 for Unreachable code

@lgtm-com
Copy link

lgtm-com bot commented Nov 1, 2020

This pull request fixes 18 alerts when merging c2426ba into 5cf83ad - view on LGTM.com

fixed alerts:

  • 5 for Module-level cyclic import
  • 5 for First argument to super() is not enclosing class
  • 4 for Missing call to __init__ during object initialization
  • 2 for Modification of parameter with default
  • 1 for Too few arguments in formatting call
  • 1 for Unreachable code

@lgtm-com
Copy link

lgtm-com bot commented Nov 1, 2020

This pull request fixes 18 alerts when merging 5183235 into 5cf83ad - view on LGTM.com

fixed alerts:

  • 5 for Module-level cyclic import
  • 5 for First argument to super() is not enclosing class
  • 4 for Missing call to __init__ during object initialization
  • 2 for Modification of parameter with default
  • 1 for Too few arguments in formatting call
  • 1 for Unreachable code

Copy link
Contributor

@gannebamm gannebamm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the travis changes do not relate specificaly to the issue, does they? Same for the geoserver-restconfig update from 2.0.4.6 > .8
Additionally I do not see how the api.py filter changes do relate to the issue, too. But maybe I just do not get it :D

From my glance over the changes you have decided to go the longer way instead of implementing the mentioned quick-fix in the issue - which I like!

@afabiani
Copy link
Member Author

afabiani commented Nov 2, 2020

@gannebamm other than travis, the others are necessary, gsconfig too

I decided to include some LGTM fixes and travis upgrade of the distribution to optimize the process

@lgtm-com
Copy link

lgtm-com bot commented Nov 2, 2020

This pull request introduces 1 alert and fixes 18 when merging 0243fb8 into 5cf83ad - view on LGTM.com

new alerts:

  • 1 for Unused local variable

fixed alerts:

  • 5 for Module-level cyclic import
  • 5 for First argument to super() is not enclosing class
  • 4 for Missing call to __init__ during object initialization
  • 2 for Modification of parameter with default
  • 1 for Too few arguments in formatting call
  • 1 for Unreachable code

@lgtm-com
Copy link

lgtm-com bot commented Nov 2, 2020

This pull request fixes 18 alerts when merging 80293e7 into 5cf83ad - view on LGTM.com

fixed alerts:

  • 5 for Module-level cyclic import
  • 5 for First argument to super() is not enclosing class
  • 4 for Missing call to __init__ during object initialization
  • 2 for Modification of parameter with default
  • 1 for Too few arguments in formatting call
  • 1 for Unreachable code

@codecov
Copy link

codecov bot commented Nov 2, 2020

Codecov Report

Merging #6597 into master will decrease coverage by 0.54%.
The diff coverage is 62.32%.

@@            Coverage Diff             @@
##           master    #6597      +/-   ##
==========================================
- Coverage   59.16%   58.62%   -0.55%     
==========================================
  Files         187      187              
  Lines       20825    21134     +309     
  Branches     3468     3486      +18     
==========================================
+ Hits        12322    12390      +68     
- Misses       7404     7672     +268     
+ Partials     1099     1072      -27     

@afabiani afabiani merged commit fe0ceee into master Nov 3, 2020
@afabiani afabiani deleted the ISSUE_6596 branch November 3, 2020 12:02
@github-actions
Copy link
Contributor

github-actions bot commented Nov 3, 2020

The backport to 3.x failed:

The process 'git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-3.x 3.x
# Navigate to the new working tree
cd .worktrees/backport-3.x
# Create a new branch
git switch --create backport-6597-to-3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick fe0ceeebae0e016c3c721f3ae7e5446aa507c9b4
# Push it to GitHub
git push --set-upstream origin backport-6597-to-3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-3.x

Then, create a pull request where the base branch is 3.x and the compare/head branch is backport-6597-to-3.x.

afabiani pushed a commit that referenced this pull request Nov 3, 2020
[Fixes #6596] Incorrect Legend displayed in the layer detail page

(cherry picked from commit fe0ceee)

# Conflicts:
#	geonode/tests/integration.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed CLA Bot: community license agreement signed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants