set cardinality (and with it the relation) of the widget and the forc…

…eSuppressFormPopup state after the widget has been created
qgis · Aug 10, 2020 · 2f13c3c · 2f13c3c
1 parent ba911ca
commit 2f13c3c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 31 deletions.
diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
@@ -125,9 +125,10 @@ void QgsRelationWidgetWrapper::setShowSaveChildEditsButton( bool showSaveChildEd
 bool QgsRelationWidgetWrapper::showLabel() const
 {
   if ( mWidget )
+  {
     return mWidget->showLabel();
-  else
-    return false;
+  }
+  return false;
 }
 
 void QgsRelationWidgetWrapper::setShowLabel( bool showLabel )
@@ -154,11 +155,6 @@ void QgsRelationWidgetWrapper::initWidget( QWidget *editor )
 
   QgsAttributeEditorContext myContext( QgsAttributeEditorContext( context(), mRelation, QgsAttributeEditorContext::Multiple, QgsAttributeEditorContext::Embed ) );
 
-  if ( forceSuppressFormPopup() )
-  {
-    const_cast<QgsVectorLayerTools *>( myContext.vectorLayerTools() )->setForceSuppressFormPopup( true );
-  }
-
   /* TODO: this seems to have no effect
   if ( config( QStringLiteral( "hide-save-child-edits" ), false ).toBool() )
   {
@@ -168,24 +164,6 @@ void QgsRelationWidgetWrapper::initWidget( QWidget *editor )
 
   w->setEditorContext( myContext );
 
-  mNmRelation = QgsProject::instance()->relationManager()->relation( cardinality().toString() );
-
-  // If this widget is already embedded by the same relation, reduce functionality
-  const QgsAttributeEditorContext *ctx = &context();
-  do
-  {
-    if ( ( ctx->relation().name() == mRelation.name() && ctx->formMode() == QgsAttributeEditorContext::Embed )
-         || ( mNmRelation.isValid() && ctx->relation().name() == mNmRelation.name() ) )
-    {
-      w->setVisible( false );
-      break;
-    }
-    ctx = ctx->parentContext();
-  }
-  while ( ctx );
-
-  w->setRelations( mRelation, mNmRelation );
-
   mWidget = w;
 }
 
@@ -226,27 +204,51 @@ QgsAttributeEditorRelation::Buttons QgsRelationWidgetWrapper::visibleButtons() c
 void QgsRelationWidgetWrapper::setForceSuppressFormPopup( bool forceSuppressFormPopup )
 {
   if ( mWidget )
+  {
     mWidget->setForceSuppressFormPopup( forceSuppressFormPopup );
+    if ( forceSuppressFormPopup )
+    {
+      const_cast<QgsVectorLayerTools *>( mWidget->editorContext().vectorLayerTools() )->setForceSuppressFormPopup( true );
+    }
+  }
 }
 
 bool QgsRelationWidgetWrapper::forceSuppressFormPopup() const
 {
   if ( mWidget )
     return mWidget->forceSuppressFormPopup();
-  else
-    return false;
+  return false;
 }
 
 void QgsRelationWidgetWrapper::setCardinality( const QVariant &cardinality )
 {
   if ( mWidget )
+  {
     mWidget->setCardinality( cardinality );
+
+    mNmRelation = QgsProject::instance()->relationManager()->relation( cardinality.toString() );
+
+    // If this widget is already embedded by the same relation, reduce functionality
+    const QgsAttributeEditorContext *ctx = &context();
+    do
+    {
+      if ( ( ctx->relation().name() == mRelation.name() && ctx->formMode() == QgsAttributeEditorContext::Embed )
+           || ( mNmRelation.isValid() && ctx->relation().name() == mNmRelation.name() ) )
+      {
+        mWidget->setVisible( false );
+        break;
+      }
+      ctx = ctx->parentContext();
+    }
+    while ( ctx );
+
+    mWidget->setRelations( mRelation, mNmRelation );
+  }
 }
 
 QVariant QgsRelationWidgetWrapper::cardinality() const
 {
   if ( mWidget )
     return mWidget->cardinality();
-  else
-    return QVariant();
+  return QVariant();
 }
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -1254,8 +1254,6 @@ QList<QgsEditorWidgetWrapper *> QgsAttributeForm::constraintDependencies( QgsEdi
 QgsRelationWidgetWrapper *QgsAttributeForm::setupRelationWidgetWrapper( const QgsRelation &rel, const QgsAttributeEditorContext &context )
 {
   QgsRelationWidgetWrapper *rww = new QgsRelationWidgetWrapper( mLayer, rel, nullptr, this );
-  const QVariantMap config = mLayer->editFormConfig().widgetConfig( rel.id() );
-  rww->setConfig( config );
   rww->setContext( context );
 
   return rww;
@@ -1962,6 +1960,7 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
       mFormWidgets.append( formWidget );
 
       newWidgetInfo.widget = formWidget;
+      newWidgetInfo.showLabel = relDef->showLabel();
       newWidgetInfo.labelText = QString();
       newWidgetInfo.labelOnTop = true;
       break;