Update tests and fix wfs exposed fields list

qgis · Sep 16, 2020 · 4743c67 · 4743c67
1 parent 49037e0
commit 4743c67
Show file tree

Hide file tree

Showing 6 changed files with 1,423 additions and 1,811 deletions.
diff --git a/src/server/services/landingpage/qgslandingpageutils.cpp b/src/server/services/landingpage/qgslandingpageutils.cpp
@@ -456,15 +456,11 @@ json QgsLandingPageUtils::projectInfo( const QString &projectUri )
           const QgsFields &cFields { vl->fields() };
           for ( const QgsField &field : cFields )
           {
-            // TODO: replace with non deprecated method and fix the tests
-            // if ( !field.configurationFlags().testFlag( QgsField::ConfigurationFlag::ExposeViaWfs ) )
-            Q_NOWARN_DEPRECATED_PUSH
-            if ( vl->excludeAttributesWfs().contains( vl->name() ) )
+            if ( !field.configurationFlags().testFlag( QgsField::ConfigurationFlag::ExposeViaWfs ) )
             {
               ++fieldIdx;
               continue;
             }
-            Q_NOWARN_DEPRECATED_POP
             const QgsFieldConstraints::Constraints constraints { field.constraints().constraints() };
             const bool notNull { constraints &QgsFieldConstraints::Constraint::ConstraintNotNull &&
                                  field.constraints().constraintStrength( QgsFieldConstraints::Constraint::ConstraintNotNull ) == QgsFieldConstraints::ConstraintStrength::ConstraintStrengthHard };