openFeatureForm: Update attributes on provided when used modal

m-kuhn · m-kuhn · commit 4b8288c026e1 · 2014-08-26T16:07:17.000+02:00
Fix #11099
diff --git a/src/app/qgsfeatureaction.cpp b/src/app/qgsfeatureaction.cpp
@@ -115,7 +115,10 @@ bool QgsFeatureAction::editFeature( bool showModal )
   if ( showModal )
   {
     dialog->setAttribute( Qt::WA_DeleteOnClose );
-    return dialog->exec();
+    int rv = dialog->exec();
+
+    mFeature.setAttributes( dialog->feature()->attributes() );
+    return rv;
   }
   else
   {
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -190,7 +190,10 @@ bool QgsAttributeForm::save()
         mLayer->beginEditCommand( mEditCommandMessage );
         bool res = mLayer->addFeature( updatedFeature );
         if ( res )
+        {
+          mFeature.setAttributes( updatedFeature.attributes() );
           mLayer->endEditCommand();
+        }
         else
           mLayer->destroyEditCommand();
       }

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,10 @@ bool QgsFeatureAction::editFeature( bool showModal )`
`115`	`115`	`if ( showModal )`
`116`	`116`	`{`
`117`	`117`	`dialog->setAttribute( Qt::WA_DeleteOnClose );`
`118`		`- return dialog->exec();`
	`118`	`+ int rv = dialog->exec();`
	`119`	`+`
	`120`	`+ mFeature.setAttributes( dialog->feature()->attributes() );`
	`121`	`+ return rv;`
`119`	`122`	`}`
`120`	`123`	`else`
`121`	`124`	`{`