change attribute action notation from [%attr%]/%attr% back to [%attr]/%attr

git-svn-id: http://svn.osgeo.org/qgis/trunk@14341 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2010-10-05 13:01:36 +00:00
parent dd7df1801a
commit f64d6020d2

View File

@ -114,9 +114,9 @@ QString QgsAttributeAction::expandAction( QString action, const QgsAttributeMap
// Check for a replace a quoted version and a non-quoted version.
QString to_replace_1 = "[%" + fit->name() + "]";
QString to_replace_2 = "%" + fit->name() + "%";
QString to_replace_3 = "%" + mLayer->attributeDisplayName( it.key() ) + "%";
QString to_replace_4 = "[%" + mLayer->attributeDisplayName( it.key() ) + "%]";
QString to_replace_2 = "%" + fit->name();
QString to_replace_3 = "%" + mLayer->attributeDisplayName( it.key() );
QString to_replace_4 = "[%" + mLayer->attributeDisplayName( it.key() ) + "]";
expanded_action = expanded_action.replace( to_replace_1, it.value().toString() );
expanded_action = expanded_action.replace( to_replace_2, it.value().toString() );