Merge branch 'master' of github.com:qgis/Quantum-GIS

This commit is contained in:
William Kyngesburye 2013-04-02 20:55:09 -05:00
commit c04a2198cc

View File

@ -531,7 +531,14 @@ bool QgisAppInterface::openFeatureForm( QgsVectorLayer *vlayer, QgsFeature &f, b
return false;
QgsFeatureAction action( tr( "Attributes changed" ), f, vlayer, -1, -1, QgisApp::instance() );
return action.editFeature();
if (vlayer->isEditable())
{
return action.editFeature();
}
else
{
return action.viewFeatureForm();
}
}
QDialog* QgisAppInterface::getFeatureForm( QgsVectorLayer *l, QgsFeature &f )