Merge pull request #2323 from PedroVenancio/grass7_plugin

Update of some QGIS-GRASS modules
qgis · Sep 20, 2015 · 13fe3a0 · 13fe3a0
2 parents 82b34af + ada8ffd
commit 13fe3a0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/plugins/grass/modules/v.db.connect.qgm b/src/plugins/grass/modules/v.db.connect.qgm
@@ -6,6 +6,6 @@
 	<option key="driver" answer="dbf" hidden="no"/>
 	<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" hidden="no"/>
 	<option key="table"/>
-	<option key="key"/>
+	<field key="key"/>
 	<flag key="o" answer="on" hidden="no"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.join.qgm b/src/plugins/grass/modules/v.db.join.qgm
@@ -6,6 +6,6 @@
 	<field key="column" layer="map" type="integer,string" label="Attribute field" />
 	<option key="otable" version_max="6"/>
 	<option key="other_table" version_min="7"/>
-	<option key="ocolumn" label="Attribute field to join" version_max="6"/>
-	<option key="other_column" label="Attribute field to join" version_min="7"/>
+	<field key="ocolumn" label="Attribute field to join" version_max="6"/>
+	<field key="other_column" label="Attribute field to join" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.update_op.qgm b/src/plugins/grass/modules/v.db.update_op.qgm
@@ -4,6 +4,6 @@
 <qgisgrassmodule label="Assign new value as result of operation on columns to column in attribute table" module="v.db.update">
 	<option key="map" layeroption="layer" />
 	<field key="column" layer="map" type="integer,double,varchar,string" label="Attribute field" />
-	<option key="qcolumn" version_max="6"/>
-	<option key="query_column" version_min="7"/>
+	<field key="qcolumn" version_max="6"/>
+	<field key="query_column" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.update_op_query.qgm b/src/plugins/grass/modules/v.db.update_op_query.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Assign new value to column as result of operation on columns only if the result of query is TRUE" module="v.db.update">
 	<option key="map" layeroption="layer" />
 	<field key="column" layer="map" type="integer,double,varchar,string" label="Attribute field" />
-	<option key="qcolumn" version_max="6"/>
-	<option key="query_column" version_min="7"/>
+	<field key="qcolumn" version_max="6"/>
+	<field key="query_column" version_min="7"/>
 	<option key="where"/>
 </qgisgrassmodule>