Don't add default actions multiple times

m-kuhn · m-kuhn · commit d12c41f23240 · 2017-01-03T19:37:07.000+01:00
Fix #16013
diff --git a/src/app/qgsattributeactiondialog.cpp b/src/app/qgsattributeactiondialog.cpp
@@ -150,7 +150,8 @@ void QgsAttributeActionDialog::insertRow( int row, const QgsAction& action )
 
 void QgsAttributeActionDialog::insertRow( int row, QgsAction::ActionType type, const QString& name, const QString& actionText, const QString& iconPath, bool capture, const QString& shortTitle, const QSet<QString>& actionScopes )
 {
-  insertRow( row, QgsAction( type, name, actionText, iconPath, capture, shortTitle, actionScopes ) );
+  if ( uniqueName( name ) == name )
+    insertRow( row, QgsAction( type, name, actionText, iconPath, capture, shortTitle, actionScopes ) );
 }
 
 void QgsAttributeActionDialog::moveUp()
@@ -356,7 +357,7 @@ QString QgsAttributeActionDialog::uniqueName( QString name )
 
   for ( int i = 0; i < pos; ++i )
   {
-    if ( mAttributeActionTable->item( i, 0 )->text() == name )
+    if ( mAttributeActionTable->item( i, Description )->text() == name )
       unique = false;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,8 @@ void QgsAttributeActionDialog::insertRow( int row, const QgsAction& action )`
`150`	`150`
`151`	`151`	`void QgsAttributeActionDialog::insertRow( int row, QgsAction::ActionType type, const QString& name, const QString& actionText, const QString& iconPath, bool capture, const QString& shortTitle, const QSet<QString>& actionScopes )`
`152`	`152`	`{`
`153`		`- insertRow( row, QgsAction( type, name, actionText, iconPath, capture, shortTitle, actionScopes ) );`
	`153`	`+ if ( uniqueName( name ) == name )`
	`154`	`+ insertRow( row, QgsAction( type, name, actionText, iconPath, capture, shortTitle, actionScopes ) );`
`154`	`155`	`}`
`155`	`156`
`156`	`157`	`void QgsAttributeActionDialog::moveUp()`
`@@ -356,7 +357,7 @@ QString QgsAttributeActionDialog::uniqueName( QString name )`
`356`	`357`
`357`	`358`	`for ( int i = 0; i < pos; ++i )`
`358`	`359`	`{`
`359`		`- if ( mAttributeActionTable->item( i, 0 )->text() == name )`
	`360`	`+ if ( mAttributeActionTable->item( i, Description )->text() == name )`
`360`	`361`	`unique = false;`
`361`	`362`	`}`
`362`	`363`