ShareDialog: Keep default server permissions by default (#4152)

diff --git a/src/gui/ocssharejob.cpp b/src/gui/ocssharejob.cpp
index 93c0c1d144b46482db372d9807c3453183c3e605..256dfd7845303bbb2b8c9f283849906dd9a8cc81 100644 (file)
--- a/src/gui/ocssharejob.cpp
+++ b/src/gui/ocssharejob.cpp
@@ -122,7 +122,9 @@ void OcsShareJob::createShare(const QString& path,
     addParam(QString::fromLatin1("path"), path);
     addParam(QString::fromLatin1("shareType"), QString::number(shareType));
     addParam(QString::fromLatin1("shareWith"), shareWith);
-    addParam(QString::fromLatin1("permissions"), QString::number(permissions));
+    if (!(permissions & Share::PermissionDefault)) {
+        addParam(QString::fromLatin1("permissions"), QString::number(permissions));
+    }
 
     start();
 }

diff --git a/src/gui/share.h b/src/gui/share.h
index 99e3e76e8df528aa659516d874beb7535dd2fc72..8ac7fae5dd2f38dd2a0d3cd498cafe772ce5101a 100644 (file)
--- a/src/gui/share.h
+++ b/src/gui/share.h
@@ -51,7 +51,8 @@ public:
         PermissionUpdate =  2,
         PermissionCreate =  4,
         PermissionDelete =  8,
-        PermissionShare  = 16
+        PermissionShare  = 16,
+        PermissionDefault = 1 << 30
     };
     Q_DECLARE_FLAGS(Permissions, Permission)
 
@@ -62,7 +63,7 @@ public:
                    const QString& id,
                    const QString& path,
                    const ShareType shareType,
-                   const Permissions permissions,
+                   const Permissions permissions = PermissionDefault,
                    const QSharedPointer<Sharee> shareWith = QSharedPointer<Sharee>(NULL));
 
     /*

diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index 8ff7c76238a0aa602c8c3db324412b2c72de9add..ffc5bfbf1726789f20e305e6489334d70c454a5d 100644 (file)
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -170,10 +170,8 @@ void ShareUserGroupWidget::slotCompleterActivated(const QModelIndex & index)
         return;
     }
 
-    _manager->createShare(_sharePath,
-                          (Share::ShareType)sharee->type(),
-                          sharee->shareWith(),
-                          Share::PermissionRead);
+    _manager->createShare(_sharePath, Share::ShareType(sharee->type()),
+                          sharee->shareWith(), Share::PermissionDefault);
 
     _ui->shareeLineEdit->setText(QString());
 }