Fix constraint expression and description are flipped

nyalldawson · nyalldawson · commit cdbd96510508 · 2019-05-08T23:19:03.000Z
Fixes #22016
diff --git a/src/app/qgsattributesformproperties.cpp b/src/app/qgsattributesformproperties.cpp
@@ -311,7 +311,7 @@ void QgsAttributesFormProperties::storeAttributeTypeDialog()
     constraints.setConstraint( QgsFieldConstraints::ConstraintExpression );
   }
 
-  constraints.setConstraintExpression( mAttributeTypeDialog->constraintExpressionDescription(), mAttributeTypeDialog->constraintExpression() );
+  constraints.setConstraintExpression( mAttributeTypeDialog->constraintExpression(), mAttributeTypeDialog->constraintExpressionDescription() );
 
   constraints.setConstraintStrength( QgsFieldConstraints::ConstraintNotNull, mAttributeTypeDialog->notNullEnforced() ?
                                      QgsFieldConstraints::ConstraintStrengthHard : QgsFieldConstraints::ConstraintStrengthSoft );

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ void QgsAttributesFormProperties::storeAttributeTypeDialog()`
`311`	`311`	`constraints.setConstraint( QgsFieldConstraints::ConstraintExpression );`
`312`	`312`	`}`
`313`	`313`
`314`		`- constraints.setConstraintExpression( mAttributeTypeDialog->constraintExpressionDescription(), mAttributeTypeDialog->constraintExpression() );`
	`314`	`+ constraints.setConstraintExpression( mAttributeTypeDialog->constraintExpression(), mAttributeTypeDialog->constraintExpressionDescription() );`
`315`	`315`
`316`	`316`	`constraints.setConstraintStrength( QgsFieldConstraints::ConstraintNotNull, mAttributeTypeDialog->notNullEnforced() ?`
`317`	`317`	`QgsFieldConstraints::ConstraintStrengthHard : QgsFieldConstraints::ConstraintStrengthSoft );`