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

[Backport release-3_4] [Backport release-3_6][server] Fallback to unmanaged parameters #9806

Merged
merged 3 commits into from Apr 18, 2019
Merged

[Backport release-3_4] [Backport release-3_6][server] Fallback to unmanaged parameters #9806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2b0e15
Add a fallback to unmanaged parameters
pblottiere Apr 11, 2019
777a17e
Add unit test
pblottiere Apr 11, 2019
734565b
Add test for an unkown parameter
pblottiere Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/server/qgsserverparameters.cpp
View file
Open in desktop
Expand Up @@ -519,7 +519,14 @@ QString QgsServerParameters::request() const

QString QgsServerParameters::value( const QString &key ) const
{
return value( QgsServerParameter::name( key ) ).toString();
if ( ! mParameters.contains( QgsServerParameter::name( key ) ) )
{
return mUnmanagedParameters[key];
}
else
{
return value( QgsServerParameter::name( key ) ).toString();
}
}

QVariant QgsServerParameters::value( QgsServerParameter::Name name ) const
Expand Down
6 changes: 6 additions & 0 deletions tests/src/python/test_qgsserver_request.py
View file
Open in desktop
Expand Up @@ -196,6 +196,12 @@ def _check_links(params, method='GET'):
_check_links(params)
_check_links(params, 'POST')

def test_add_parameters(self):
request = QgsServerRequest()
request.setParameter('FOOBAR', 'foobar')
self.assertEqual(request.parameter('FOOBAR'), 'foobar')
self.assertEqual(request.parameter('UNKNOWN'), '')


if __name__ == '__main__':
unittest.main()