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

Filter WMS capabilities with correct OGC server #2932

Merged
merged 12 commits into from
Jun 12, 2017

Conversation

ger-benjamin
Copy link
Member

@ger-benjamin ger-benjamin commented May 11, 2017

Part of #2929

TODO:

  • Fix DetachedInstanceError: Instance <LayerWMS at 0x7feae2836290> is not bound to a Session; attribute refresh operation cannot proceed -> maybe come frome the cache_on_argument It seems to work with a single argument but not with an array ? -> must to expung objects in session
  • add tests

(I've not tested the things about doing a curl to get capabilities with basic auth.)

@sbrunner
Copy link
Member

You should also add a test case :-)

@ger-benjamin ger-benjamin force-pushed the fix_wms_capabilities_privacy branch 5 times, most recently from cdbb4b0 to f499361 Compare June 8, 2017 07:47
@sbrunner sbrunner force-pushed the fix_wms_capabilities_privacy branch 9 times, most recently from bd8c630 to ad50080 Compare June 9, 2017 14:06
@sbrunner sbrunner force-pushed the fix_wms_capabilities_privacy branch from ad50080 to 04f1b15 Compare June 9, 2017 14:32
@ger-benjamin ger-benjamin changed the title WIP: Filter WMS capabilities with correct OGC server Filter WMS capabilities with correct OGC server Jun 12, 2017
Copy link
Member Author

@ger-benjamin ger-benjamin left a comment

Choose a reason for hiding this comment

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

Mhh can't approve because that's my own PR at the beginning 😒
But I approve

@@ -152,15 +161,19 @@ def caching_prepare_input_source(source, base=None):
saxutils.prepare_input_source = caching_prepare_input_source


def filter_capabilities(content, role_id, wms, wms_url, headers, proxies):
def filter_capabilities(content, role_id, wms, url, headers, proxies, request, ):
Copy link
Member Author

Choose a reason for hiding this comment

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

last , works but looks strange

Copy link
Member

Choose a reason for hiding this comment

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

fixed :-)

@@ -63,65 +64,65 @@
caching.init_region({"backend": "dogpile.cache.memory"})


def cleanup_db():
Copy link
Member Author

@ger-benjamin ger-benjamin Jun 12, 2017

Choose a reason for hiding this comment

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

That cleans really all ? What about metadata, tsearch... ? Perhaps layer ? (or that comes with treeitem ? but both layerv1 and v2 ?)

Copy link
Member

Choose a reason for hiding this comment

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

TreeItem cover all the tree, FullTextSearch and Shorturl will be added.

@sbrunner sbrunner force-pushed the fix_wms_capabilities_privacy branch from 04f1b15 to f0a3a75 Compare June 12, 2017 07:06
@ger-benjamin ger-benjamin added this to the 2.1 milestone Jun 12, 2017
@ger-benjamin
Copy link
Member Author

Can I merge ?

@sbrunner sbrunner merged commit a196bec into 2.1 Jun 12, 2017
@sbrunner sbrunner deleted the fix_wms_capabilities_privacy branch June 12, 2017 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants