Merge pull request #9776 from pblottiere/server_params

elpaso · web-flow · commit 6092d569910f · 2019-04-12T09:31:35.000+02:00
[server] Fallback to unmanaged parameters
diff --git a/src/server/qgsserverparameters.cpp b/src/server/qgsserverparameters.cpp
@@ -531,7 +531,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()

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,14 @@ QString QgsServerParameters::request() const`
`531`	`531`
`532`	`532`	`QString QgsServerParameters::value( const QString &key ) const`
`533`	`533`	`{`
`534`		`- return value( QgsServerParameter::name( key ) ).toString();`
	`534`	`+ if ( ! mParameters.contains( QgsServerParameter::name( key ) ) )`
	`535`	`+ {`
	`536`	`+ return mUnmanagedParameters[key];`
	`537`	`+ }`
	`538`	`+ else`
	`539`	`+ {`
	`540`	`+ return value( QgsServerParameter::name( key ) ).toString();`
	`541`	`+ }`
`535`	`542`	`}`
`536`	`543`
`537`	`544`	`QVariant QgsServerParameters::value( QgsServerParameter::Name name ) const`