Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/providers/postgres/qgspostgresdataitemguiprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1141,13 +1141,16 @@ void QgsPostgresDataItemGuiProvider::saveCurrentProject( QgsPGSchemaItem *schema
pgProjectUri.schemaName = schemaItem->name();
pgProjectUri.projectName = project->title().isEmpty() ? project->baseName() : project->title();

const QString previousTitle = project->title();

if ( pgProjectUri.projectName.isEmpty() )
{
bool ok;
const QString projectName = QInputDialog::getText( nullptr, tr( "Set Project Name" ), tr( "Name" ), QLineEdit::Normal, tr( "New Project" ), &ok );
if ( ok && !projectName.isEmpty() )
{
pgProjectUri.projectName = projectName;
project->setTitle( projectName );
}
else
{
Expand All @@ -1173,21 +1176,21 @@ void QgsPostgresDataItemGuiProvider::saveCurrentProject( QgsPGSchemaItem *schema
notify( tr( "Save Project" ), tr( "Project “%1” exist in the database. Overwriting it." ).arg( pgProjectUri.projectName ), context, Qgis::MessageLevel::Info );
}

// read the project, set title and new filename
QgsProject savedProject;
savedProject.read( project->fileName() );
savedProject.setFileName( projectUri );
const QString previousFileName = project->fileName();
project->setFileName( projectUri );

// write project to the database
const bool success = savedProject.write();
const bool success = project->write();
if ( !success )
{
notify( tr( "Save Project" ), tr( "Unable to save project “%1” to “%2”." ).arg( savedProject.title(), schemaItem->name() ), context, Qgis::MessageLevel::Warning );
notify( tr( "Save Project" ), tr( "Unable to save project “%1” to “%2”." ).arg( project->title(), schemaItem->name() ), context, Qgis::MessageLevel::Warning );
conn->unref();
project->setFileName( previousFileName );
project->setTitle( previousTitle );
return;
}

notify( tr( "Save Project" ), tr( "Project “%1” saved to schema “%2”." ).arg( savedProject.title(), schemaItem->name() ), context, Qgis::MessageLevel::Info );
notify( tr( "Save Project" ), tr( "Project “%1” saved to schema “%2”." ).arg( project->title(), schemaItem->name() ), context, Qgis::MessageLevel::Info );

// refresh
schemaItem->refresh();
Expand Down
Loading