fix editable attribute of joined fields (fix #7739)

Based on pull request 576 by minorua

Author: m-kuhn

src/app/qgsattributetypedialog.cpp

@@ -109,6 +109,11 @@ void QgsAttributeTypeDialog::setFieldEditable( bool editable )
   isFieldEditableCheckBox->setChecked( editable );
 }
 
+void QgsAttributeTypeDialog::setFieldEditableEnabled( bool enabled )
+{
+  isFieldEditableCheckBox->setEnabled( enabled );
+}
+
 void QgsAttributeTypeDialog::setLabelOnTop( bool onTop )
 {
   labelOnTopCheckBox->setChecked( onTop );

src/app/qgsattributetypedialog.h

@@ -100,6 +100,13 @@ class QgsAttributeTypeDialog: public QDialog, private Ui::QgsAttributeTypeDialog
      */
     void setFieldEditable( bool editable );
 
+    /**
+     * Sets the enabled state of the "editable" checkbox
+     *
+     * @param enabled sets the enabled state of the checkbox
+     */
+    void setFieldEditableEnabled( bool enabled );
+
     /**
      * Setter for checkbox to label on top
      * @param bool onTop

src/app/qgsfieldsproperties.cpp

@@ -494,6 +494,7 @@ void QgsFieldsProperties::attributeTypeDialog()
   attributeTypeDialog.setLabelOnTop( cfg.mLabelOnTop );
 
   attributeTypeDialog.setIndex( index, cfg.mEditType );
+  attributeTypeDialog.setFieldEditableEnabled( cfg.mEditableEnabled );
 
   if ( !attributeTypeDialog.exec() )
     return;
@@ -930,6 +931,7 @@ QgsFieldsProperties::FieldConfig::FieldConfig( QgsVectorLayer* layer, int idx )
     : mButton( NULL )
 {
   mEditable = layer->fieldEditable( idx );
+  mEditableEnabled = layer->pendingFields().fieldOrigin( idx ) != QgsFields::OriginJoin;
   mLabelOnTop = layer->labelOnTop( idx );
   mValueRelationData = layer->valueRelation( idx );
   mValueMap = layer->valueMap( idx );

src/app/qgsfieldsproperties.h

@@ -54,6 +54,7 @@ class QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPropertiesBase
         FieldConfig( QgsVectorLayer* layer, int idx );
 
         bool mEditable;
+        bool mEditableEnabled;
         bool mLabelOnTop;
         QgsVectorLayer::ValueRelationData mValueRelationData;
         QMap<QString, QVariant> mValueMap;

src/app/qgsvectorlayerproperties.cpp

@@ -954,6 +954,7 @@ void QgsVectorLayerProperties::on_mButtonAddJoin_clicked()
       pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
                                    !layer->isEditable() && layer->vectorJoins().size() < 1 );
     }
+    mFieldsPropertiesDialog->init();
   }
 }
 
@@ -995,6 +996,7 @@ void QgsVectorLayerProperties::on_mButtonRemoveJoin_clicked()
   mJoinTreeWidget->takeTopLevelItem( mJoinTreeWidget->indexOfTopLevelItem( currentJoinItem ) );
   pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
                                !layer->isEditable() && layer->vectorJoins().size() < 1 );
+  mFieldsPropertiesDialog->init();
 }
 
 

src/core/qgsvectorlayer.cpp

@@ -3083,7 +3083,11 @@ bool QgsVectorLayer::fieldEditable( int idx )
 {
   const QgsFields &fields = pendingFields();
   if ( idx >= 0 && idx < fields.count() )
+  {
+    if ( mUpdatedFields.fieldOrigin( idx ) == QgsFields::OriginJoin )
+      return false;
     return mFieldEditables.value( fields[idx].name(), true );
+  }
   else
     return true;
 }