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

Port default print layout #5661

Merged
merged 3 commits into from
Mar 30, 2020
Merged

Port default print layout #5661

merged 3 commits into from
Mar 30, 2020

Conversation

llienher
Copy link
Member

Port 2.4 features in master branch

@llienher llienher requested a review from sbrunner March 27, 2020 10:30
@llienher llienher self-assigned this Mar 27, 2020
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

@llienher
Copy link
Member Author

@sbrunner I have an issue in the console, testing this port:

vendor.js?dev:2 org.mapfish.print.ExtraPropertyException: Extra properties found in the request attributes
Extra Properties: 

	* goodnessOfFit

All allowed properties are: 

	* northArrow
	* comments
	* debug
	* requestHeaders
	* legend
	* datasource
	* title
	* map
	* scalebar

Do you have an idea what is missing ? I'm pretty sure we already had this problem in the past but cannot figure out what we did to fix it...

@sbrunner
Copy link
Member

@llienher Where do you found that?

@llienher
Copy link
Member Author

@sbrunner It's in my console, error when trying to print

@sbrunner
Copy link
Member

It's not already present on master?

@llienher
Copy link
Member Author

Yes, it is actually the previous merged PR that broke that, not related to this one. So visible on master.

@sbrunner
Copy link
Member

C'est aussi le cas sur 2.4 :-(

@sbrunner
Copy link
Member

@llienher
Copy link
Member Author

@sbrunner Nice catch, seems to fix it if we remove it.

@sbrunner
Copy link
Member

src/print/Service.js Outdated Show resolved Hide resolved
@llienher
Copy link
Member Author

@sbrunner I did pass the parameter to the service from the component via an optional parameter in the createSpec method. That's cleaner. :)

Copy link
Member

@sbrunner sbrunner left a comment

Choose a reason for hiding this comment

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

Thanks :-)

@llienher llienher merged commit 6941b52 into master Mar 30, 2020
@llienher llienher deleted the port-default-print-layout branch March 30, 2020 13:50
@github-actions
Copy link

Error on backporting to branch 2.4, error on cherry picking ['116ad94d1ee8133889ce0c26e68cb7de65d04cf3', 'cf7ac12f699c8717ea7cf29be7fb26250bbaff74', 'f6f4f899297b7cbe749dced281118949e35ecc74']:
b"error: could not apply 116ad94... Bind default layout to print component\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add ' or 'git rm '\nhint: and commit the result with 'git commit'\n"
b''

to continue do:
git fetch
git checkout backport/5661-to-2.4
git cherry-pick 116ad94
git cherry-pick cf7ac12
git cherry-pick f6f4f89
git push origin backport/5661-to-2.4

And do the pull request (if needed).

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.

3 participants