Filter comboboxes are reset when the widget is initialised and foreign key is deleted

pblottiere · pblottiere · commit f18293fb395c · 2017-10-10T07:05:28.000+01:00
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

Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,15 @@ void QgsRelationReferenceWidget::setForeignKey( const QVariant &value )`
`300`	`300`	`void QgsRelationReferenceWidget::deleteForeignKey()`
`301`	`301`	`{`
`302`	`302`	`QVariant nullValue = QgsApplication::nullRepresentation();`
	`303`	`+`
	`304`	`+ // deactivate filter comboboxes`
	`305`	`+ if ( mChainFilters && !mFilterComboBoxes.isEmpty() )`
	`306`	`+ {`
	`307`	`+ QComboBox *cb = mFilterComboBoxes.first();`
	`308`	`+ cb->setCurrentIndex( 0 );`
	`309`	`+ disableChainedComboBoxes( cb );`
	`310`	`+ }`
	`311`	`+`
`303`	`312`	`if ( mReadOnlySelector )`
`304`	`313`	`{`
`305`	`314`	`QString nullText;`
`@@ -511,6 +520,13 @@ void QgsRelationReferenceWidget::init()`
`511`	`520`	`mFilterCache[mFilterFields[i]][cf] << nf;`
`512`	`521`	`}`
`513`	`522`	`}`
	`523`	`+`
	`524`	`+ if ( !mFilterComboBoxes.isEmpty() )`
	`525`	`+ {`
	`526`	`+ QComboBox *cb = mFilterComboBoxes.first();`
	`527`	`+ cb->setCurrentIndex( 0 );`
	`528`	`+ disableChainedComboBoxes( cb );`
	`529`	`+ }`
`514`	`530`	`}`
`515`	`531`	`}`
`516`	`532`	`else`