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.

Sign up for GitHub

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

Jump to bottom

Fix TextAtWeb links GSPOE-29 #970

Merged
merged 4 commits into from
Dec 19, 2019
Merged

Fix TextAtWeb links GSPOE-29 #970

merged 4 commits into from
Dec 19, 2019

Conversation

marionb
Copy link
Contributor

@marionb marionb commented Dec 17, 2019 •
edited
Loading

This PR changes the data structure of TextAtWeb in to an array of dictionaries such that it is possible to group the TextAtWeb from multiple legal provisions with the same title. The structure in the JSON is now as follows:

...
'TextAtWeb': [
    { 'URL': 'https://www.<URL1>'}
    { 'URL': 'https://www.<URL2>'}
    ...
]
...

TOTEST:
To be able to test the templates the PR openoereb/pyramid_oereb_mfp#44 is needed.

@marionb marionb requested review from jwkaltz and danduk82 December 17, 2019 09:55
@marionb marionb mentioned this pull request Dec 17, 2019
Merged
4 tasks
@marionb marionb force-pushed the Fix-TextAtWeb-Links-GSPOE-29 branch 2 times, most recently from 4faec78 to c517231 Compare December 17, 2019 21:36
jwkaltz
jwkaltz requested changes Dec 18, 2019
View reviewed changes
pyramid_oereb/contrib/print_proxy/mapfish_print.py Outdated
if element == 'LegalProvisions':
pdf_to_join.update([legal_provision['TextAtWeb'] for legal_provision in values])
# TESTME --> This line is not thoroughly tested for the full extract as it is not
Copy link
Member

@jwkaltz jwkaltz Dec 18, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

It is not testable in a local docker development environment, but I have tested it on a server using a the test release https://test.pypi.org/project/pyramid-oereb/1.5.2b3/
The full extract is working fine, both with grouping turned on and with grouping turned off.

@marionb marionb force-pushed the Fix-TextAtWeb-Links-GSPOE-29 branch from c517231 to 2f8b30e Compare December 19, 2019 07:01
@jwkaltz jwkaltz merged commit ead695d into master Dec 19, 2019
@jwkaltz jwkaltz deleted the Fix-TextAtWeb-Links-GSPOE-29 branch December 19, 2019 08:33
@marionb marionb self-assigned this Jan 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwkaltz jwkaltz jwkaltz approved these changes

@danduk82 danduk82 Awaiting requested review from danduk82

Assignees

@marionb marionb

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@marionb @jwkaltz