Merge pull request #1481 from giohappy/alias_remove_when_empty

Remove alias from vector layer if it's an empty string. Fix #10437
qgis · Aug 10, 2014 · c3bd82a · c3bd82a
2 parents fe4e552 + 26587af
commit c3bd82a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -605,7 +605,14 @@ void QgsFieldsProperties::attributesListCellChanged( int row, int column )
     QTableWidgetItem *aliasItem = mFieldsList->item( row, column );
     if ( aliasItem )
     {
-      mLayer->addAttributeAlias( idx, aliasItem->text() );
+        if ( !aliasItem->text().trimmed().isEmpty() )
+        {
+          mLayer->addAttributeAlias( idx, aliasItem->text() );
+        }
+        else
+        {
+          mLayer->remAttributeAlias(idx);
+        }
     }
   }
 }

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2046,6 +2046,19 @@ bool QgsVectorLayer::addAttribute( const QgsField &field )
   return mEditBuffer->addAttribute( field );
 }
 
+void QgsVectorLayer::remAttributeAlias( int attIndex)
+{
+  if ( attIndex < 0 || attIndex >= pendingFields().count() )
+    return;
+
+  QString name = pendingFields()[ attIndex ].name();
+  if ( mAttributeAliasMap.contains(name) )
+  {
+    mAttributeAliasMap.remove( name );
+    emit layerModified();
+  }
+}
+
 void QgsVectorLayer::addAttributeAlias( int attIndex, QString aliasString )
 {
   if ( attIndex < 0 || attIndex >= pendingFields().count() )

diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1116,6 +1116,12 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
      */
     void addAttributeAlias( int attIndex, QString aliasString );
 
+    /**
+     * Removes an alias (a display name) for attributes to display in dialogs
+     * @note added in version 2.4
+     */
+    void remAttributeAlias( int attIndex );
+
     /**
      * Adds a tab (for the attribute editor form) holding groups and fields
      * @note added in version 2.0