Skip to content

Commit

Permalink
Merge pull request #5389 from boundlessgeo/auth_fix_wms_from_browser_…
Browse files Browse the repository at this point in the history
…backport

[auth][bugfix][backported] Fix auth for WFS browser items
  • Loading branch information
elpaso authored Oct 17, 2017
2 parents 3dfe1b3 + 76d0d80 commit fe52c93
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/providers/wfs/qgswfsdataitems.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 ) );
}
}

Expand Down

0 comments on commit fe52c93

Please sign in to comment.