keep editing on failed attribute commit

jef · jef · commit c65aee641aaa · 2008-03-12T14:14:09.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@8210 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsattributetabledisplay.cpp b/src/app/qgsattributetabledisplay.cpp
@@ -191,23 +191,24 @@ void QgsAttributeTableDisplay::stopEditing()
   {
     //commit or roll back?
     QMessageBox::StandardButton commit=QMessageBox::information(this,tr("Stop editing"),
-                                        tr("Do you want to save the changes?"),
-                                        QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+      tr("Do you want to save the changes?"),
+      QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
     if(commit==QMessageBox::Save)
     {
       if(!table()->commitChanges(mLayer))
       {
-        QMessageBox::information(this,tr("Error"),tr("Could not commit changes"));
+        QMessageBox::information(this,tr("Error"),tr("Could not commit changes - changes are still pending"));
+        return;
       }
     }
     else if(commit == QMessageBox::Discard)
     {
       table()->rollBack(mLayer);
     }
     else //cancel
-      {
-	return;
-      }
+    {
+      return;
+    }
   }
   btnStartEditing->setEnabled(true);
   btnStopEditing->setEnabled(false);

Original file line number	Diff line number	Diff line change
`@@ -191,23 +191,24 @@ void QgsAttributeTableDisplay::stopEditing()`
`191`	`191`	`{`
`192`	`192`	`//commit or roll back?`
`193`	`193`	`QMessageBox::StandardButton commit=QMessageBox::information(this,tr("Stop editing"),`
`194`		`- tr("Do you want to save the changes?"),`
`195`		`- QMessageBox::Save \| QMessageBox::Discard \| QMessageBox::Cancel);`
	`194`	`+ tr("Do you want to save the changes?"),`
	`195`	`+ QMessageBox::Save \| QMessageBox::Discard \| QMessageBox::Cancel);`
`196`	`196`	`if(commit==QMessageBox::Save)`
`197`	`197`	`{`
`198`	`198`	`if(!table()->commitChanges(mLayer))`
`199`	`199`	`{`
`200`		`- QMessageBox::information(this,tr("Error"),tr("Could not commit changes"));`
	`200`	`+ QMessageBox::information(this,tr("Error"),tr("Could not commit changes - changes are still pending"));`
	`201`	`+ return;`
`201`	`202`	`}`
`202`	`203`	`}`
`203`	`204`	`else if(commit == QMessageBox::Discard)`
`204`	`205`	`{`
`205`	`206`	`table()->rollBack(mLayer);`
`206`	`207`	`}`
`207`	`208`	`else //cancel`
`208`		`- {`
`209`		`- return;`
`210`		`- }`
	`209`	`+ {`
	`210`	`+ return;`
	`211`	`+ }`
`211`	`212`	`}`
`212`	`213`	`btnStartEditing->setEnabled(true);`
`213`	`214`	`btnStopEditing->setEnabled(false);`