Merge pull request #9791 from rldhont/server_params-release-3_6

[Backport release-3_6][server] Fallback to unmanaged parameters
qgis · Apr 17, 2019 · 1fac5a6 · 1fac5a6
2 parents 267599b + d730aa3
commit 1fac5a6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/server/qgsserverparameters.cpp b/src/server/qgsserverparameters.cpp
@@ -526,7 +526,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

diff --git a/tests/src/python/test_qgsserver_request.py b/tests/src/python/test_qgsserver_request.py
@@ -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()