Button to store data in project activates the property if it exists in auxiliary layer

pblottiere · pblottiere · commit e1781b97284e · 2017-10-09T05:01:34.000+01:00
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -1069,8 +1069,9 @@ void QgsDiagramProperties::createAuxiliaryField()
   const QgsDiagramLayerSettings::Property key = static_cast< QgsDiagramLayerSettings::Property >( button->propertyKey() );
   const QgsPropertyDefinition def = QgsDiagramLayerSettings::propertyDefinitions()[key];
 
-  // create property in auxiliary storage
-  mLayer->auxiliaryLayer()->addAuxiliaryField( def );
+  // create property in auxiliary storage if necessary
+  if ( !mLayer->auxiliaryLayer()->exists( def ) )
+    mLayer->auxiliaryLayer()->addAuxiliaryField( def );
 
   // update property with join field name from auxiliary storage
   QgsProperty property = button->toProperty();
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -639,8 +639,9 @@ void QgsLabelingGui::createAuxiliaryField()
   const QgsPalLayerSettings::Property key = static_cast< QgsPalLayerSettings::Property >( button->propertyKey() );
   const QgsPropertyDefinition def = QgsPalLayerSettings::propertyDefinitions()[key];
 
-  // create property in auxiliary storage
-  mLayer->auxiliaryLayer()->addAuxiliaryField( def );
+  // create property in auxiliary storage if necessary
+  if ( !mLayer->auxiliaryLayer()->exists( def ) )
+    mLayer->auxiliaryLayer()->addAuxiliaryField( def );
 
   // update property with join field name from auxiliary storage
   QgsProperty property = button->toProperty();
diff --git a/src/gui/qgspropertyoverridebutton.cpp b/src/gui/qgspropertyoverridebutton.cpp
@@ -68,6 +68,7 @@ QgsPropertyOverrideButton::QgsPropertyOverrideButton( QWidget *parent,
   mActionDescription = new QAction( tr( "Description..." ), this );
 
   mActionCreateAuxiliaryField = new QAction( tr( "Store data in the project" ), this );
+  mActionCreateAuxiliaryField->setCheckable( true );
 
   mActionExpDialog = new QAction( tr( "Edit..." ), this );
   mActionExpression = nullptr;
@@ -337,13 +338,15 @@ void QgsPropertyOverrideButton::aboutToShowMenu()
 
   const QgsAuxiliaryLayer *alayer = mVectorLayer->auxiliaryLayer();
 
+  mActionCreateAuxiliaryField->setEnabled( true );
+  mActionCreateAuxiliaryField->setChecked( false );
   if ( alayer && alayer->exists( mDefinition ) )
   {
-    mActionCreateAuxiliaryField->setEnabled( false );
-  }
-  else
-  {
-    mActionCreateAuxiliaryField->setEnabled( true );
+    if ( mProperty.field() == QgsAuxiliaryField::name( mDefinition, true ) )
+    {
+      mActionCreateAuxiliaryField->setEnabled( false );
+      mActionCreateAuxiliaryField->setChecked( true );
+    }
   }
 
   bool fieldActive = false;
