Merge pull request #36349 from troopa81/fix_rename_user_expr

elpaso · web-flow · commit c13b677e57a0 · 2020-05-15T07:41:58.000+02:00
Don't add another user expression when changing its label
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -927,6 +927,12 @@ void QgsExpressionBuilderWidget::editSelectedUserExpression()
 
   if ( dlg.exec() == QDialog::DialogCode::Accepted )
   {
+    // label has changed removed the old one before adding the new one
+    if ( dlg.label() != item->text() )
+    {
+      mExpressionTreeView->removeFromUserExpressions( item->text() );
+    }
+
     mExpressionTreeView->saveToUserExpressions( dlg.label(), dlg.expression(), dlg.helpText() );
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -927,6 +927,12 @@ void QgsExpressionBuilderWidget::editSelectedUserExpression()`
`927`	`927`
`928`	`928`	`if ( dlg.exec() == QDialog::DialogCode::Accepted )`
`929`	`929`	`{`
	`930`	`+ // label has changed removed the old one before adding the new one`
	`931`	`+ if ( dlg.label() != item->text() )`
	`932`	`+ {`
	`933`	`+ mExpressionTreeView->removeFromUserExpressions( item->text() );`
	`934`	`+ }`
	`935`	`+`
`930`	`936`	`mExpressionTreeView->saveToUserExpressions( dlg.label(), dlg.expression(), dlg.helpText() );`
`931`	`937`	`}`
`932`	`938`	`}`