final relation cardinality combobox

qgis · Nov 2, 2017 · 90546b0 · 90546b0
1 parent 9b670d0
commit 90546b0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/src/app/qgsattributerelationedit.cpp b/src/app/qgsattributerelationedit.cpp
@@ -12,9 +12,9 @@ QgsAttributeRelationEdit::~QgsAttributeRelationEdit()
 {
 }
 
-void QgsAttributeRelationEdit::setCardinalityCombo( const QString &cardinalityComboItem )
+void QgsAttributeRelationEdit::setCardinalityCombo( const QString &cardinalityComboItem, const QVariant &auserData )
 {
-  coCardinality->addItem( cardinalityComboItem );
+  coCardinality->addItem( cardinalityComboItem, auserData );
 }
 
 void QgsAttributeRelationEdit::setCardinality( const QString &cardinality )

diff --git a/src/app/qgsattributerelationedit.h b/src/app/qgsattributerelationedit.h
@@ -45,7 +45,7 @@ class APP_EXPORT QgsAttributeRelationEdit: public QWidget, private Ui::QgsAttrib
     /**
      * Setter for combo cardinality item
      */
-    void setCardinalityCombo( const QString &cardinalityComboItem );
+    void setCardinalityCombo( const QString &cardinalityComboItem, const QVariant &auserData = QVariant()  );
 
     /**
      * Setter for combo cardinality

diff --git a/src/app/qgsattributesformproperties.cpp b/src/app/qgsattributesformproperties.cpp
@@ -118,8 +118,7 @@ void QgsAttributesFormProperties::loadAttributeTypeDialog()
 }
 
 
-void QgsAttributesFormProperties::storeAttributeTypeDialog()
-{
+void QgsAttributesFormProperties::storeAttributeTypeDialog(){
   FieldConfig cfg;
 
   cfg.mEditable = mAttributeTypeDialog->fieldEditable();
@@ -194,8 +193,17 @@ void QgsAttributesFormProperties::loadAttributeRelationEdit()
     RelationConfig cfg = currentItem->data( 0, RelationConfigRole ).value<RelationConfig>();
 
     mAttributeRelationEdit = new QgsAttributeRelationEdit( currentItem->data( 0, FieldNameRole ).toString(), mAttributeTypeFrame );
-    mAttributeRelationEdit->setCardinalityCombo( "testoption 1" );
-    mAttributeRelationEdit->setCardinalityCombo( "testoption 2" );
+
+    mAttributeRelationEdit->setCardinalityCombo( tr( "Many to one relation" ) );
+
+    QgsRelation relation = QgsProject::instance()->relationManager()->relation( currentItem->data( 0, FieldNameRole ).toString() );
+
+    Q_FOREACH ( const QgsRelation &nmrel, QgsProject::instance()->relationManager()->referencingRelations( relation.referencingLayer() ) )
+    {
+      if ( nmrel.fieldPairs().at( 0 ).referencingField() != relation.fieldPairs().at( 0 ).referencingField() )
+       mAttributeRelationEdit->setCardinalityCombo( QStringLiteral( "%1 (%2)" ).arg( nmrel.referencedLayer()->name(), nmrel.fieldPairs().at( 0 ).referencedField() ), nmrel.id() );
+    }
+
     mAttributeRelationEdit->setCardinality( cfg.mCardinality );
 
     mAttributeRelationEdit->layout()->setMargin( 0 );
@@ -501,14 +509,9 @@ QgsAttributeEditorElement *QgsAttributesFormProperties::createAttributeEditorWid
 
 void QgsAttributesFormProperties::apply()
 {
-  if ( mAttributeTypeDialog )
-  {
-    storeAttributeTypeDialog();
-  }
-  else
-  {
-    storeAttributeRelationEdit();
-  }
+
+  storeAttributeTypeDialog();
+  storeAttributeRelationEdit();
 
   QgsEditFormConfig editFormConfig = mLayer->editFormConfig();