Fix #10337 - Allow attribute form on all features (new QgsFeatures ar…

…e invalid)
qgis · May 25, 2014 · 9bdc932 · 9bdc932
1 parent 41e37e1
commit 9bdc932
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -150,5 +150,5 @@ void QgsAttributeDialog::init( QgsVectorLayer* layer, QgsFeature* feature, QgsAt
   mDialog->layout()->addWidget( mAttributeForm );
   QDialogButtonBox* buttonBox = mAttributeForm->findChild<QDialogButtonBox*>();
   connect( buttonBox, SIGNAL( rejected() ), mDialog, SLOT( close() ) );
-  connect( buttonBox, SIGNAL( accepted() ), mDialog, SLOT( close() ) );
+  connect( buttonBox, SIGNAL( accepted() ), mDialog, SLOT( accept() ) );
 }
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -227,21 +227,15 @@ void QgsAttributeForm::onAttributeDeleted( int idx )
 
 void QgsAttributeForm::synchronizeEnabledState()
 {
+  bool enabled = mLayer->isEditable();
   Q_FOREACH( QgsWidgetWrapper* ww, mWidgets )
   {
-    if ( mFeature.isValid() && mLayer->isEditable() )
-    {
-      ww->setEnabled( true );
-    }
-    else
-    {
-      ww->setEnabled( false );
-    }
+     ww->setEnabled( enabled );
   }
 
   QPushButton* okButton = mButtonBox->button( QDialogButtonBox::Ok );
   if ( okButton )
-    okButton->setEnabled( mFeature.isValid() && mLayer->isEditable() );
+    okButton->setEnabled( enabled );
 }
 
 void QgsAttributeForm::init()