Skip to content

Commit

Permalink
[GRASS] qgm dbcolumn field check only if not hidden
Browse files Browse the repository at this point in the history
  • Loading branch information
blazek committed Sep 4, 2015
1 parent 438b689 commit c0a8958
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions src/plugins/grass/qgsgrassmoduleoptions.cpp
Expand Up @@ -219,13 +219,17 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(

if ( promptElem.attribute( "prompt" ) == "dbcolumn" )
{
// G_OPT_DB_COLUMN may be also used for new columns (v.in.db) so we check also if there is at least one input vector
// but a vector input may also exist (v.random).
QList<QDomNode> vectorNodes = QgsGrassModuleParam::nodesByType( descDocElem, G_OPT_V_INPUT, "old" );
QgsDebugMsg( QString( "vectorNodes.size() = %1" ).arg( vectorNodes.size() ) );
if ( !vectorNodes.isEmpty() )
// Give only warning if the option is not hidden
if ( !so->hidden() )
{
mErrors << tr( "Option '%1' should be configured as field" ).arg( so->key() );
// G_OPT_DB_COLUMN may be also used for new columns (v.in.db) so we check also if there is at least one input vector
// but a vector input may also exist (v.random).
QList<QDomNode> vectorNodes = QgsGrassModuleParam::nodesByType( descDocElem, G_OPT_V_INPUT, "old" );
QgsDebugMsg( QString( "vectorNodes.size() = %1" ).arg( vectorNodes.size() ) );
if ( !vectorNodes.isEmpty() )
{
mErrors << tr( "Option '%1' should be configured as field" ).arg( so->key() );
}
}
}
}
Expand Down

0 comments on commit c0a8958

Please sign in to comment.