Merge pull request #3289 from dgoedkoop/valuemapsearchnull

Add handling of null value in value map to search widget
qgis · Sep 5, 2016 · 1819b31 · 1819b31
2 parents 6dbdd4c + 5f39455
commit 1819b31
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp
@@ -15,6 +15,7 @@
 
 #include "qgsvaluemapsearchwidgetwrapper.h"
 #include "qgstexteditconfigdlg.h"
+#include "qgsvaluemapconfigdlg.h"
 
 #include "qgsfield.h"
 #include "qgsfieldvalidator.h"
@@ -145,7 +146,8 @@ void QgsValueMapSearchWidgetWrapper::initWidget( QWidget* editor )
 
     while ( it != cfg.constEnd() )
     {
-      mComboBox->addItem( it.key(), it.value() );
+      if ( it.value() != QString( VALUEMAP_NULL_TEXT ) )
+        mComboBox->addItem( it.key(), it.value() );
       ++it;
     }
     connect( mComboBox, SIGNAL( currentIndexChanged( int ) ), this, SLOT( comboBoxIndexChanged( int ) ) );