Filter comboboxes are reset when the widget is initialised and foreig…

…n key is deleted
qgis · Oct 10, 2017 · f18293f · f18293f
1 parent 8759e7c
commit f18293f
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -300,6 +300,15 @@ void QgsRelationReferenceWidget::setForeignKey( const QVariant &value )
 void QgsRelationReferenceWidget::deleteForeignKey()
 {
   QVariant nullValue = QgsApplication::nullRepresentation();
+
+  // deactivate filter comboboxes
+  if ( mChainFilters && !mFilterComboBoxes.isEmpty() )
+  {
+    QComboBox *cb = mFilterComboBoxes.first();
+    cb->setCurrentIndex( 0 );
+    disableChainedComboBoxes( cb );
+  }
+
   if ( mReadOnlySelector )
   {
     QString nullText;
@@ -511,6 +520,13 @@ void QgsRelationReferenceWidget::init()
             mFilterCache[mFilterFields[i]][cf] << nf;
           }
         }
+
+        if ( !mFilterComboBoxes.isEmpty() )
+        {
+          QComboBox *cb = mFilterComboBoxes.first();
+          cb->setCurrentIndex( 0 );
+          disableChainedComboBoxes( cb );
+        }
       }
     }
     else