attribute editing: don't allow editing without ChangeAttributeValues capability

jef-n · jef-n · commit 58ee9bb312d7 · 2015-11-26T20:32:29.000+01:00
(cherry picked from commit 15af5a1)
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -27,6 +27,7 @@
 #include "qgsmaplayerregistry.h"
 #include "qgsrendererv2.h"
 #include "qgsvectorlayer.h"
+#include "qgsvectordataprovider.h"
 
 #include <QVariant>
 
@@ -560,7 +561,9 @@ Qt::ItemFlags QgsAttributeTableModel::flags( const QModelIndex &index ) const
   Qt::ItemFlags flags = QAbstractItemModel::flags( index );
 
   if ( layer()->isEditable() &&
-       layer()->fieldEditable( mAttributes[ index.column()] ) )
+       layer()->fieldEditable( mAttributes[ index.column()] ) &&
+       (( layer()->dataProvider() && layer()->dataProvider()->capabilities() & QgsVectorDataProvider::ChangeAttributeValues ) ||
+        FID_IS_NEW( rowToId( index.row() ) ) ) )
     flags |= Qt::ItemIsEditable;
 
   return flags;
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -22,6 +22,7 @@
 #include "qgsproject.h"
 #include "qgspythonrunner.h"
 #include "qgsrelationwidgetwrapper.h"
+#include "qgsvectordataprovider.h"
 
 #include <QDir>
 #include <QFileInfo>
@@ -323,7 +324,9 @@ void QgsAttributeForm::synchronizeEnabledState()
     QgsEditorWidgetWrapper* eww = qobject_cast<QgsEditorWidgetWrapper*>( ww );
     if ( eww )
     {
-      fieldEditable = mLayer->fieldEditable( eww->fieldIdx() );
+      fieldEditable = mLayer->fieldEditable( eww->fieldIdx() ) &&
+                      (( mLayer->dataProvider() && layer()->dataProvider()->capabilities() & QgsVectorDataProvider::ChangeAttributeValues ) ||
+                       FID_IS_NEW( mFeature.id() ) );
     }
     ww->setEnabled( isEditable && fieldEditable );
   }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include "qgsproject.h"`
`23`	`23`	`#include "qgspythonrunner.h"`
`24`	`24`	`#include "qgsrelationwidgetwrapper.h"`
	`25`	`+#include "qgsvectordataprovider.h"`
`25`	`26`
`26`	`27`	`#include <QDir>`
`27`	`28`	`#include <QFileInfo>`
`@@ -323,7 +324,9 @@ void QgsAttributeForm::synchronizeEnabledState()`
`323`	`324`	`QgsEditorWidgetWrapper* eww = qobject_cast<QgsEditorWidgetWrapper*>( ww );`
`324`	`325`	`if ( eww )`
`325`	`326`	`{`
`326`		`- fieldEditable = mLayer->fieldEditable( eww->fieldIdx() );`
	`327`	`+ fieldEditable = mLayer->fieldEditable( eww->fieldIdx() ) &&`
	`328`	`+ (( mLayer->dataProvider() && layer()->dataProvider()->capabilities() & QgsVectorDataProvider::ChangeAttributeValues ) \|\|`
	`329`	`+ FID_IS_NEW( mFeature.id() ) );`
`327`	`330`	`}`
`328`	`331`	`ww->setEnabled( isEditable && fieldEditable );`
`329`	`332`	`}`