[GRASS] qgm dbcolumn field check only if not hidden

blazek · blazek · commit c0a89584bee2 · 2015-09-04T08:36:42.000+02:00
diff --git a/src/plugins/grass/qgsgrassmoduleoptions.cpp b/src/plugins/grass/qgsgrassmoduleoptions.cpp
@@ -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() );
+              }
             }
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -219,13 +219,17 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(`
`219`	`219`
`220`	`220`	`if ( promptElem.attribute( "prompt" ) == "dbcolumn" )`
`221`	`221`	`{`
`222`		`- // 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`
`223`		`- // but a vector input may also exist (v.random).`
`224`		`- QList<QDomNode> vectorNodes = QgsGrassModuleParam::nodesByType( descDocElem, G_OPT_V_INPUT, "old" );`
`225`		`- QgsDebugMsg( QString( "vectorNodes.size() = %1" ).arg( vectorNodes.size() ) );`
`226`		`- if ( !vectorNodes.isEmpty() )`
	`222`	`+ // Give only warning if the option is not hidden`
	`223`	`+ if ( !so->hidden() )`
`227`	`224`	`{`
`228`		`- mErrors << tr( "Option '%1' should be configured as field" ).arg( so->key() );`
	`225`	`+ // 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`
	`226`	`+ // but a vector input may also exist (v.random).`
	`227`	`+ QList<QDomNode> vectorNodes = QgsGrassModuleParam::nodesByType( descDocElem, G_OPT_V_INPUT, "old" );`
	`228`	`+ QgsDebugMsg( QString( "vectorNodes.size() = %1" ).arg( vectorNodes.size() ) );`
	`229`	`+ if ( !vectorNodes.isEmpty() )`
	`230`	`+ {`
	`231`	`+ mErrors << tr( "Option '%1' should be configured as field" ).arg( so->key() );`
	`232`	`+ }`
`229`	`233`	`}`
`230`	`234`	`}`
`231`	`235`	`}`