Fix incorrect behavior of Field Format combobox in date time widget config

agiudiceandrea · nyalldawson · commit 788180c22720 · 2020-05-25T09:30:13.000+10:00
diff --git a/src/gui/editorwidgets/qgsdatetimeeditconfig.cpp b/src/gui/editorwidgets/qgsdatetimeeditconfig.cpp
@@ -415,6 +415,10 @@ void QgsDateTimeEditConfig::updateFieldFormat( int idx )
   {
     mFieldFormatEdit->setText( format );
   }
+  else if ( mFieldFormatEdit->text() == QgsDateTimeFieldFormatter::QT_ISO_FORMAT )
+  {
+    mFieldFormatEdit->setText( QgsDateTimeFieldFormatter::DISPLAY_FOR_ISO_FORMAT );
+  }
 
   mFieldFormatEdit->setEnabled( custom );
   mFieldHelpToolButton->setVisible( custom );

Original file line number	Diff line number	Diff line change
`@@ -415,6 +415,10 @@ void QgsDateTimeEditConfig::updateFieldFormat( int idx )`
`415`	`415`	`{`
`416`	`416`	`mFieldFormatEdit->setText( format );`
`417`	`417`	`}`
	`418`	`+ else if ( mFieldFormatEdit->text() == QgsDateTimeFieldFormatter::QT_ISO_FORMAT )`
	`419`	`+ {`
	`420`	`+ mFieldFormatEdit->setText( QgsDateTimeFieldFormatter::DISPLAY_FOR_ISO_FORMAT );`
	`421`	`+ }`
`418`	`422`
`419`	`423`	`mFieldFormatEdit->setEnabled( custom );`
`420`	`424`	`mFieldHelpToolButton->setVisible( custom );`