Fix #17444 : GeoNode data provider completely ignores authentication (#…

…5634) * Fix #17444 : GeoNode data provider completely ignores authentication - hide the authentication group until GeoNode API supports authentication.
qgis · Nov 15, 2017 · 364ddc1 · 364ddc1
1 parent 6d01543
commit 364ddc1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/python/gui/qgsnewhttpconnection.sip b/python/gui/qgsnewhttpconnection.sip
@@ -35,6 +35,7 @@ class QgsNewHttpConnection : QDialog
     enum Flag
     {
       FlagShowTestConnection,
+      FlagHideAuthenticationGroup,
     };
     typedef QFlags<QgsNewHttpConnection::Flag> Flags;
 

diff --git a/src/gui/qgsnewhttpconnection.cpp b/src/gui/qgsnewhttpconnection.cpp
@@ -121,6 +121,11 @@ QgsNewHttpConnection::QgsNewHttpConnection( QWidget *parent, ConnectionTypes typ
     mGroupBox->layout()->removeWidget( mTestConnectionButton );
   }
 
+  if ( flags & FlagHideAuthenticationGroup )
+  {
+    mAuthGroupBox->hide();
+    mGroupBox->layout()->removeWidget( mAuthGroupBox );
+  }
   // Adjust height
   int w = width();
   adjustSize();

diff --git a/src/gui/qgsnewhttpconnection.h b/src/gui/qgsnewhttpconnection.h
@@ -56,6 +56,7 @@ class GUI_EXPORT QgsNewHttpConnection : public QDialog, private Ui::QgsNewHttpCo
     enum Flag
     {
       FlagShowTestConnection = 1 << 1, //!< Display the 'test connection' button
+      FlagHideAuthenticationGroup = 1 << 2, //!< Hide the Authentication group
     };
     Q_DECLARE_FLAGS( Flags, Flag )
 

diff --git a/src/providers/geonode/qgsgeonodenewconnection.cpp b/src/providers/geonode/qgsgeonodenewconnection.cpp
@@ -20,14 +20,18 @@
 #include "qgsgeonodeconnection.h"
 #include "qgsgeonoderequest.h"
 
+/* For now we are hiding away authentication options since
+   there is no support yet for authentication in GeoNode's API.
+   We will re-enable this when this limitation changes.
+   See https://github.com/GeoNode/geonode/issues/3442 TS */
+
 QgsGeoNodeNewConnection::QgsGeoNodeNewConnection( QWidget *parent, const QString &connName, Qt::WindowFlags fl )
   : QgsNewHttpConnection( parent, QgsNewHttpConnection::ConnectionWfs | QgsNewHttpConnection::ConnectionWms,
-                          QgsGeoNodeConnectionUtils::pathGeoNodeConnection() + '/', connName, QgsNewHttpConnection::FlagShowTestConnection, fl )
+                          QgsGeoNodeConnectionUtils::pathGeoNodeConnection() + '/', connName,
+                          QgsNewHttpConnection::FlagShowTestConnection | QgsNewHttpConnection::FlagHideAuthenticationGroup, fl )
 {
   setWindowTitle( tr( "Create a New GeoNode Connection" ) );
-
   updateServiceSpecificSettings();
-
   connect( testConnectButton(), &QPushButton::clicked, this, &QgsGeoNodeNewConnection::testConnection );
 }