Merge pull request #8524 from signedav/editafteredit

elpaso · web-flow · commit b6d9e0ba4921 · 2018-11-22T13:43:58.000+01:00
[Bugfix] Release cell from focus on editing off
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -875,6 +875,12 @@ void QgsAttributeTableDialog::mActionToggleEditing_toggled( bool )
 {
   if ( !mLayer )
     return;
+
+  //this has to be done, because in case only one cell has been changed and is still enabled, the change
+  //would not be added to the mEditBuffer. By disabling, it looses focus and the change will be stored.
+  if ( mLayer->isEditable() && mMainView->tableView()->indexWidget( mMainView->tableView()->currentIndex() ) )
+    mMainView->tableView()->indexWidget( mMainView->tableView()->currentIndex() )->setEnabled( false );
+
   if ( !QgisApp::instance()->toggleEditing( mLayer ) )
   {
     // restore gui state if toggling was canceled or layer commit/rollback failed

Original file line number	Diff line number	Diff line change
`@@ -875,6 +875,12 @@ void QgsAttributeTableDialog::mActionToggleEditing_toggled( bool )`
`875`	`875`	`{`
`876`	`876`	`if ( !mLayer )`
`877`	`877`	`return;`
	`878`	`+`
	`879`	`+ //this has to be done, because in case only one cell has been changed and is still enabled, the change`
	`880`	`+ //would not be added to the mEditBuffer. By disabling, it looses focus and the change will be stored.`
	`881`	`+ if ( mLayer->isEditable() && mMainView->tableView()->indexWidget( mMainView->tableView()->currentIndex() ) )`
	`882`	`+ mMainView->tableView()->indexWidget( mMainView->tableView()->currentIndex() )->setEnabled( false );`
	`883`	`+`
`878`	`884`	`if ( !QgisApp::instance()->toggleEditing( mLayer ) )`
`879`	`885`	`{`
`880`	`886`	`// restore gui state if toggling was canceled or layer commit/rollback failed`