Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #35828 from elpaso/server-cleanup
Server (minor) cleanup
  • Loading branch information
elpaso committed Apr 18, 2020
2 parents f48e1c8 + aa5428c commit 8b61e24
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
6 changes: 3 additions & 3 deletions python/server/auto_generated/qgsaccesscontrolfilter.sip.in
Expand Up @@ -18,9 +18,9 @@ class QgsAccessControlFilter
Class defining access control interface for QGIS Server plugins.

Security can define any (or none) of the following method:
* layerFilterExpression() - To get an additional expression filter (WMS/GetMap, WMS/GetFeatureInfo, WFS/GetFeature)
* layerFilterSQL() - To get an additional SQL filter (WMS/GetMap, WMS/GetFeatureInfo, WFS/GetFeature) for layer that support SQL
* layerPermissions() - To give the general layer permissins (read / update / insert / delete)
* layerFilterExpression() - To set an additional QGIS expression filter (WMS/GetMap, WMS/GetFeatureInfo, WFS/GetFeature)
* layerFilterSubsetString() - To set an additional SQL subset string filter (WMS/GetMap, WMS/GetFeatureInfo, WFS/GetFeature) for layer that support SQL
* layerPermissions() - To set the general layer permissins (read / update / insert / delete)
* authorizedLayerAttributes() - To filter the attributes (WMS/GetFeatureInfo, WFS/GetFeature)
* allowToEdit() - (all WFS-T requests)
* cacheKey()
Expand Down
2 changes: 1 addition & 1 deletion src/server/qgsaccesscontrolfilter.cpp
Expand Up @@ -40,7 +40,7 @@ QString QgsAccessControlFilter::layerFilterExpression( const QgsVectorLayer *lay
//! Returns an additional layer subset string (typically SQL) filter
QString QgsAccessControlFilter::layerFilterSubsetString( const QgsVectorLayer *layer ) const
{
QgsMessageLog::logMessage( QStringLiteral( "QgsAccessControlFilter plugin default layerFilterSQL called" ), QStringLiteral( "AccessControlFilter" ), Qgis::Info );
QgsMessageLog::logMessage( QStringLiteral( "QgsAccessControlFilter plugin default layerFilterSubsetString called" ), QStringLiteral( "AccessControlFilter" ), Qgis::Info );
Q_UNUSED( layer )
return QString();
}
Expand Down
6 changes: 3 additions & 3 deletions src/server/qgsaccesscontrolfilter.h
Expand Up @@ -39,9 +39,9 @@ class QgsFeature;
* \brief Class defining access control interface for QGIS Server plugins.
*
* Security can define any (or none) of the following method:
* * layerFilterExpression() - To get an additional expression filter (WMS/GetMap, WMS/GetFeatureInfo, WFS/GetFeature)
* * layerFilterSQL() - To get an additional SQL filter (WMS/GetMap, WMS/GetFeatureInfo, WFS/GetFeature) for layer that support SQL
* * layerPermissions() - To give the general layer permissins (read / update / insert / delete)
* * layerFilterExpression() - To set an additional QGIS expression filter (WMS/GetMap, WMS/GetFeatureInfo, WFS/GetFeature)
* * layerFilterSubsetString() - To set an additional SQL subset string filter (WMS/GetMap, WMS/GetFeatureInfo, WFS/GetFeature) for layer that support SQL
* * layerPermissions() - To set the general layer permissins (read / update / insert / delete)
* * authorizedLayerAttributes() - To filter the attributes (WMS/GetFeatureInfo, WFS/GetFeature)
* * allowToEdit() - (all WFS-T requests)
* * cacheKey()
Expand Down
3 changes: 0 additions & 3 deletions src/server/qgsserver.h
Expand Up @@ -124,9 +124,6 @@ class SERVER_EXPORT QgsServer
*/
static void setupNetworkAccessManager();

//! Create and return a request handler instance
static QgsRequestHandler *createRequestHandler( const QgsServerRequest &request, QgsServerResponse &response );

// Return the server name
static QString &serverName();

Expand Down

0 comments on commit 8b61e24

Please sign in to comment.