[Pkg-owncloud-commits] [owncloud-client] 441/484: [Sharing] Files should not have create permissions

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit b033a8e7311e34d106b906962229e1aef9c86744
Author: Roeland Jago Douma <rullzer at owncloud.com>
Date:   Mon Nov 30 15:47:10 2015 +0100

    [Sharing] Files should not have create permissions
---
 src/gui/shareusergroupwidget.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index ed46dad..d0cd2f3 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -213,13 +213,17 @@ ShareWidget::ShareWidget(QSharedPointer<Share> share,
     QMenu *menu = new QMenu(this);
     _permissionCreate = new QAction(tr("create"), this);
     _permissionCreate->setCheckable(true);
-    menu->addAction(_permissionCreate);
     _permissionUpdate = new QAction(tr("change"), this);
     _permissionUpdate->setCheckable(true);
-    menu->addAction(_permissionUpdate);
     _permissionDelete = new QAction(tr("delete"), this);
     _permissionDelete->setCheckable(true);
+
+    menu->addAction(_permissionUpdate);
+    /*
+     * Files can't have create or delete permissions
+     */
     if (!_isFile) {
+        menu->addAction(_permissionCreate);
         menu->addAction(_permissionDelete);
     }
     _ui->permissionToolButton->setMenu(menu);
@@ -266,10 +270,13 @@ void ShareWidget::slotEditPermissionsChanged()
     }
     
     if (_ui->permissionsEdit->checkState() == Qt::Checked) {
-        permissions |= Share::PermissionCreate;
         permissions |= Share::PermissionUpdate;
 
+        /*
+         * Files can't have create or delete permisisons
+         */
         if (!_isFile) {
+            permissions |= Share::PermissionCreate;
             permissions |= Share::PermissionDelete;
         }
     }
@@ -350,7 +357,7 @@ void ShareWidget::displayPermissions()
         _permissionUpdate->setChecked(true);
         _ui->permissionsEdit->setCheckState(Qt::Checked);
     }
-    if (_share->getPermissions() & Share::PermissionCreate) {
+    if (!_isFile && _share->getPermissions() & Share::PermissionCreate) {
         _permissionCreate->setChecked(true);
         _ui->permissionsEdit->setCheckState(Qt::Checked);
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git