Merge pull request #5389 from boundlessgeo/auth_fix_wms_from_browser_backport

elpaso · web-flow · commit fe52c93b955d · 2017-10-17T14:07:33.000+02:00
[auth][bugfix][backported] Fix auth for WFS browser items
diff --git a/src/providers/wfs/qgswfsdataitems.cpp b/src/providers/wfs/qgswfsdataitems.cpp
@@ -32,7 +32,7 @@ QgsWFSLayerItem::QgsWFSLayerItem( QgsDataItem* parent, QString name, const QgsDa
 {
   QSettings settings;
   bool useCurrentViewExtent = settings.value( "/Windows/WFSSourceSelect/FeatureCurrentViewExtent", true ).toBool();
-  mUri = QgsWFSDataSourceURI::build( uri.uri(), featureType, crsString, QString(), useCurrentViewExtent );
+  mUri = QgsWFSDataSourceURI::build( uri.uri( false ), featureType, crsString, QString(), useCurrentViewExtent );
   setState( Populated );
   mIconName = "mIconConnect.png";
 }
@@ -146,7 +146,7 @@ QVector<QgsDataItem*> QgsWFSRootItem::createChildren()
   {
     QgsWFSConnection connection( connName );
     QString path = "wfs:/" + connName;
-    QgsDataItem * conn = new QgsWFSConnectionItem( this, connName, path, connection.uri().uri() );
+    QgsDataItem * conn = new QgsWFSConnectionItem( this, connName, path, connection.uri().uri( false ) );
     connections.append( conn );
   }
   return connections;
@@ -213,7 +213,7 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
     if ( QgsWFSConnection::connectionList().contains( connectionName ) )
     {
       QgsWFSConnection connection( connectionName );
-      return new QgsWFSConnectionItem( parentItem, "WFS", thePath, connection.uri().uri() );
+      return new QgsWFSConnectionItem( parentItem, "WFS", thePath, connection.uri().uri( false ) );
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ QgsWFSLayerItem::QgsWFSLayerItem( QgsDataItem* parent, QString name, const QgsDa`
`32`	`32`	`{`
`33`	`33`	`QSettings settings;`
`34`	`34`	`bool useCurrentViewExtent = settings.value( "/Windows/WFSSourceSelect/FeatureCurrentViewExtent", true ).toBool();`
`35`		`- mUri = QgsWFSDataSourceURI::build( uri.uri(), featureType, crsString, QString(), useCurrentViewExtent );`
	`35`	`+ mUri = QgsWFSDataSourceURI::build( uri.uri( false ), featureType, crsString, QString(), useCurrentViewExtent );`
`36`	`36`	`setState( Populated );`
`37`	`37`	`mIconName = "mIconConnect.png";`
`38`	`38`	`}`
`@@ -146,7 +146,7 @@ QVector<QgsDataItem*> QgsWFSRootItem::createChildren()`
`146`	`146`	`{`
`147`	`147`	`QgsWFSConnection connection( connName );`
`148`	`148`	`QString path = "wfs:/" + connName;`
`149`		`- QgsDataItem * conn = new QgsWFSConnectionItem( this, connName, path, connection.uri().uri() );`
	`149`	`+ QgsDataItem * conn = new QgsWFSConnectionItem( this, connName, path, connection.uri().uri( false ) );`
`150`	`150`	`connections.append( conn );`
`151`	`151`	`}`
`152`	`152`	`return connections;`
`@@ -213,7 +213,7 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )`
`213`	`213`	`if ( QgsWFSConnection::connectionList().contains( connectionName ) )`
`214`	`214`	`{`
`215`	`215`	`QgsWFSConnection connection( connectionName );`
`216`		`- return new QgsWFSConnectionItem( parentItem, "WFS", thePath, connection.uri().uri() );`
	`216`	`+ return new QgsWFSConnectionItem( parentItem, "WFS", thePath, connection.uri().uri( false ) );`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`