Enables Postgresql service based connections without database name

jgrocha · jgrocha · commit 79e7bdeb2ead · 2020-05-01T19:23:58.000+01:00
diff --git a/src/providers/postgres/qgspgnewconnection.cpp b/src/providers/postgres/qgspgnewconnection.cpp
@@ -249,7 +249,7 @@ void QgsPgNewConnection::showHelp()
 void QgsPgNewConnection::updateOkButtonState()
 {
   bool enabled = !txtName->text().isEmpty() && (
-                   ( !txtService->text().isEmpty() && !txtDatabase->text().isEmpty() ) ||
+                   ( !txtService->text().isEmpty() && txtDatabase->text().isEmpty() ) ||
                    ( !txtHost->text().isEmpty() && !txtPort->text().isEmpty() && !txtDatabase->text().isEmpty() ) );
   buttonBox->button( QDialogButtonBox::Ok )->setEnabled( enabled );
 }
diff --git a/src/providers/postgres/qgspgsourceselect.cpp b/src/providers/postgres/qgspgsourceselect.cpp
@@ -345,6 +345,7 @@ void QgsPgSourceSelect::btnLoad_clicked()
 void QgsPgSourceSelect::btnEdit_clicked()
 {
   QgsPgNewConnection *nc = new QgsPgNewConnection( this, cmbConnections->currentText() );
+  nc->setWindowTitle( tr( "Edit PostGIS Connection" ) );
   if ( nc->exec() )
   {
     populateConnectionList();
diff --git a/src/providers/postgres/qgspostgresdataitemguiprovider.cpp b/src/providers/postgres/qgspostgresdataitemguiprovider.cpp
@@ -185,6 +185,7 @@ void QgsPostgresDataItemGuiProvider::newConnection( QgsDataItem *item )
 void QgsPostgresDataItemGuiProvider::editConnection( QgsDataItem *item )
 {
   QgsPgNewConnection nc( nullptr, item->name() );
+  nc.setWindowTitle( tr( "Edit PostGIS Connection" ) );
   if ( nc.exec() )
   {
     // the parent should be updated

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ void QgsPgNewConnection::showHelp()`
`249`	`249`	`void QgsPgNewConnection::updateOkButtonState()`
`250`	`250`	`{`
`251`	`251`	`bool enabled = !txtName->text().isEmpty() && (`
`252`		`- ( !txtService->text().isEmpty() && !txtDatabase->text().isEmpty() ) \|\|`
	`252`	`+ ( !txtService->text().isEmpty() && txtDatabase->text().isEmpty() ) \|\|`
`253`	`253`	`( !txtHost->text().isEmpty() && !txtPort->text().isEmpty() && !txtDatabase->text().isEmpty() ) );`
`254`	`254`	`buttonBox->button( QDialogButtonBox::Ok )->setEnabled( enabled );`
`255`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -345,6 +345,7 @@ void QgsPgSourceSelect::btnLoad_clicked()`
`345`	`345`	`void QgsPgSourceSelect::btnEdit_clicked()`
`346`	`346`	`{`
`347`	`347`	`QgsPgNewConnection *nc = new QgsPgNewConnection( this, cmbConnections->currentText() );`
	`348`	`+ nc->setWindowTitle( tr( "Edit PostGIS Connection" ) );`
`348`	`349`	`if ( nc->exec() )`
`349`	`350`	`{`
`350`	`351`	`populateConnectionList();`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ void QgsPostgresDataItemGuiProvider::newConnection( QgsDataItem *item )`
`185`	`185`	`void QgsPostgresDataItemGuiProvider::editConnection( QgsDataItem *item )`
`186`	`186`	`{`
`187`	`187`	`QgsPgNewConnection nc( nullptr, item->name() );`
	`188`	`+ nc.setWindowTitle( tr( "Edit PostGIS Connection" ) );`
`188`	`189`	`if ( nc.exec() )`
`189`	`190`	`{`
`190`	`191`	`// the parent should be updated`