Merge pull request #1481 from giohappy/alias_remove_when_empty

NathanW2 · NathanW2 · commit c3bd82aa7be2 · 2014-08-11T09:03:22.000+10:00
Remove alias from vector layer if it's an empty string. Fix #10437
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

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,14 @@ void QgsFieldsProperties::attributesListCellChanged( int row, int column )`
`605`	`605`	`QTableWidgetItem *aliasItem = mFieldsList->item( row, column );`
`606`	`606`	`if ( aliasItem )`
`607`	`607`	`{`
`608`		`- mLayer->addAttributeAlias( idx, aliasItem->text() );`
	`608`	`+ if ( !aliasItem->text().trimmed().isEmpty() )`
	`609`	`+ {`
	`610`	`+ mLayer->addAttributeAlias( idx, aliasItem->text() );`
	`611`	`+ }`
	`612`	`+ else`
	`613`	`+ {`
	`614`	`+ mLayer->remAttributeAlias(idx);`
	`615`	`+ }`
`609`	`616`	`}`
`610`	`617`	`}`
`611`	`618`	`}`