fix working on constraints when field list sorted

tudorbarascu · m-kuhn · commit 21637fd6de68 · 2017-01-25T09:29:59.000+01:00
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -996,27 +996,27 @@ void QgsFieldsProperties::apply()
 
     if ( cfg.mConstraints & QgsFieldConstraints::ConstraintNotNull )
     {
-      mLayer->setFieldConstraint( i, QgsFieldConstraints::ConstraintNotNull, cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintNotNull, QgsFieldConstraints::ConstraintStrengthHard ) );
+      mLayer->setFieldConstraint( idx, QgsFieldConstraints::ConstraintNotNull, cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintNotNull, QgsFieldConstraints::ConstraintStrengthHard ) );
     }
     else
     {
-      mLayer->removeFieldConstraint( i, QgsFieldConstraints::ConstraintNotNull );
+      mLayer->removeFieldConstraint( idx, QgsFieldConstraints::ConstraintNotNull );
     }
     if ( cfg.mConstraints & QgsFieldConstraints::ConstraintUnique )
     {
-      mLayer->setFieldConstraint( i, QgsFieldConstraints::ConstraintUnique, cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintUnique, QgsFieldConstraints::ConstraintStrengthHard ) );
+      mLayer->setFieldConstraint( idx, QgsFieldConstraints::ConstraintUnique, cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintUnique, QgsFieldConstraints::ConstraintStrengthHard ) );
     }
     else
     {
-      mLayer->removeFieldConstraint( i, QgsFieldConstraints::ConstraintUnique );
+      mLayer->removeFieldConstraint( idx, QgsFieldConstraints::ConstraintUnique );
     }
     if ( cfg.mConstraints & QgsFieldConstraints::ConstraintExpression )
     {
-      mLayer->setFieldConstraint( i, QgsFieldConstraints::ConstraintExpression, cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintExpression, QgsFieldConstraints::ConstraintStrengthHard ) );
+      mLayer->setFieldConstraint( idx, QgsFieldConstraints::ConstraintExpression, cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintExpression, QgsFieldConstraints::ConstraintStrengthHard ) );
     }
     else
     {
-      mLayer->removeFieldConstraint( i, QgsFieldConstraints::ConstraintExpression );
+      mLayer->removeFieldConstraint( idx, QgsFieldConstraints::ConstraintExpression );
     }
 
     if ( mFieldsList->item( i, AttrWMSCol )->checkState() == Qt::Unchecked )

Original file line number	Diff line number	Diff line change
`@@ -996,27 +996,27 @@ void QgsFieldsProperties::apply()`
`996`	`996`
`997`	`997`	`if ( cfg.mConstraints & QgsFieldConstraints::ConstraintNotNull )`
`998`	`998`	`{`
`999`		`- mLayer->setFieldConstraint( i, QgsFieldConstraints::ConstraintNotNull, cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintNotNull, QgsFieldConstraints::ConstraintStrengthHard ) );`
	`999`	`+ mLayer->setFieldConstraint( idx, QgsFieldConstraints::ConstraintNotNull, cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintNotNull, QgsFieldConstraints::ConstraintStrengthHard ) );`
`1000`	`1000`	`}`
`1001`	`1001`	`else`
`1002`	`1002`	`{`
`1003`		`- mLayer->removeFieldConstraint( i, QgsFieldConstraints::ConstraintNotNull );`
	`1003`	`+ mLayer->removeFieldConstraint( idx, QgsFieldConstraints::ConstraintNotNull );`
`1004`	`1004`	`}`
`1005`	`1005`	`if ( cfg.mConstraints & QgsFieldConstraints::ConstraintUnique )`
`1006`	`1006`	`{`
`1007`		`- mLayer->setFieldConstraint( i, QgsFieldConstraints::ConstraintUnique, cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintUnique, QgsFieldConstraints::ConstraintStrengthHard ) );`
	`1007`	`+ mLayer->setFieldConstraint( idx, QgsFieldConstraints::ConstraintUnique, cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintUnique, QgsFieldConstraints::ConstraintStrengthHard ) );`
`1008`	`1008`	`}`
`1009`	`1009`	`else`
`1010`	`1010`	`{`
`1011`		`- mLayer->removeFieldConstraint( i, QgsFieldConstraints::ConstraintUnique );`
	`1011`	`+ mLayer->removeFieldConstraint( idx, QgsFieldConstraints::ConstraintUnique );`
`1012`	`1012`	`}`
`1013`	`1013`	`if ( cfg.mConstraints & QgsFieldConstraints::ConstraintExpression )`
`1014`	`1014`	`{`
`1015`		`- mLayer->setFieldConstraint( i, QgsFieldConstraints::ConstraintExpression, cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintExpression, QgsFieldConstraints::ConstraintStrengthHard ) );`
	`1015`	`+ mLayer->setFieldConstraint( idx, QgsFieldConstraints::ConstraintExpression, cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintExpression, QgsFieldConstraints::ConstraintStrengthHard ) );`
`1016`	`1016`	`}`
`1017`	`1017`	`else`
`1018`	`1018`	`{`
`1019`		`- mLayer->removeFieldConstraint( i, QgsFieldConstraints::ConstraintExpression );`
	`1019`	`+ mLayer->removeFieldConstraint( idx, QgsFieldConstraints::ConstraintExpression );`
`1020`	`1020`	`}`
`1021`	`1021`
`1022`	`1022`	`if ( mFieldsList->item( i, AttrWMSCol )->checkState() == Qt::Unchecked )`