Fix saving of excluded attributes for wms/wfs server

mhugent · mhugent · commit 727d66a9fa93 · 2012-11-30T09:22:04.000+01:00
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -807,6 +807,8 @@ void QgsFieldsProperties::on_mEditorLayoutComboBox_currentIndexChanged( int inde
 
 void QgsFieldsProperties::apply()
 {
+  QSet<QString> excludeAttributesWMS, excludeAttributesWFS;
+
   for ( int i = 0; i < mAttributesList->rowCount(); i++ )
   {
     int idx = mAttributesList->item( i, attrIdCol )->text().toInt();
@@ -865,6 +867,15 @@ void QgsFieldsProperties::apply()
       case QgsVectorLayer::UuidGenerator:
         break;
     }
+
+    if ( mAttributesList->item( i, attrWMSCol )->checkState() == Qt::Unchecked )
+    {
+      excludeAttributesWMS.insert( mAttributesList->item( i, attrNameCol )->text() );
+    }
+    if ( mAttributesList->item( i, attrWFSCol )->checkState() == Qt::Unchecked )
+    {
+      excludeAttributesWFS.insert( mAttributesList->item( i, attrNameCol )->text() );
+    }
   }
 
   //tabs and groups
@@ -879,4 +890,7 @@ void QgsFieldsProperties::apply()
   mLayer->setEditorLayout(( QgsVectorLayer::EditorLayout )mEditorLayoutComboBox->currentIndex() );
   mLayer->setEditForm( leEditForm->text() );
   mLayer->setEditFormInit( leEditFormInit->text() );
+
+  mLayer->setExcludeAttributesWMS( excludeAttributesWMS );
+  mLayer->setExcludeAttributesWFS( excludeAttributesWFS );
 }

Original file line number	Diff line number	Diff line change
`@@ -807,6 +807,8 @@ void QgsFieldsProperties::on_mEditorLayoutComboBox_currentIndexChanged( int inde`
`807`	`807`
`808`	`808`	`void QgsFieldsProperties::apply()`
`809`	`809`	`{`
	`810`	`+ QSet<QString> excludeAttributesWMS, excludeAttributesWFS;`
	`811`	`+`
`810`	`812`	`for ( int i = 0; i < mAttributesList->rowCount(); i++ )`
`811`	`813`	`{`
`812`	`814`	`int idx = mAttributesList->item( i, attrIdCol )->text().toInt();`
`@@ -865,6 +867,15 @@ void QgsFieldsProperties::apply()`
`865`	`867`	`case QgsVectorLayer::UuidGenerator:`
`866`	`868`	`break;`
`867`	`869`	`}`
	`870`	`+`
	`871`	`+ if ( mAttributesList->item( i, attrWMSCol )->checkState() == Qt::Unchecked )`
	`872`	`+ {`
	`873`	`+ excludeAttributesWMS.insert( mAttributesList->item( i, attrNameCol )->text() );`
	`874`	`+ }`
	`875`	`+ if ( mAttributesList->item( i, attrWFSCol )->checkState() == Qt::Unchecked )`
	`876`	`+ {`
	`877`	`+ excludeAttributesWFS.insert( mAttributesList->item( i, attrNameCol )->text() );`
	`878`	`+ }`
`868`	`879`	`}`
`869`	`880`
`870`	`881`	`//tabs and groups`
`@@ -879,4 +890,7 @@ void QgsFieldsProperties::apply()`
`879`	`890`	`mLayer->setEditorLayout(( QgsVectorLayer::EditorLayout )mEditorLayoutComboBox->currentIndex() );`
`880`	`891`	`mLayer->setEditForm( leEditForm->text() );`
`881`	`892`	`mLayer->setEditFormInit( leEditFormInit->text() );`
	`893`	`+`
	`894`	`+ mLayer->setExcludeAttributesWMS( excludeAttributesWMS );`
	`895`	`+ mLayer->setExcludeAttributesWFS( excludeAttributesWFS );`
`882`	`896`	`}`