Merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-actions-07 into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

Removed unnecessary checks, it is already done in FileSystemAction::canMoveItems() and FileSystemAction::populateEntry()

Removed unnecessary checks, it is already done in FileSystemAction::canMoveItems() and FileSystemAction::populateEntry()

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:438
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/510/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3094
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3094/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/226
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/132

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/510/rebuild

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

review: Approve

=== modified file 'src/plugin/folderlistmodel/filesystemaction.cpp'
--- src/plugin/folderlistmodel/filesystemaction.cpp	2015-07-18 21:52:38 +0000
+++ src/plugin/folderlistmodel/filesystemaction.cpp	2015-07-18 21:52:39 +0000
@@ -933,18 +933,8 @@
 #endif
     m_clipboardChanged = false;
     if (items.count())
-    {
-        DirItemInfo destination(m_path);
-        if (destination.isWritable())
-        {
-            createAndProcessAction(ActionCopy, items);
-        }
-        else
-        {
-            emit error(tr("Cannot copy items"),
-                       tr("no write permission on folder ") + destination.absoluteFilePath() );
-
-        }
+    {       
+        createAndProcessAction(ActionCopy, items);
     }
 }
 
@@ -957,30 +947,7 @@
     m_clipboardChanged = false;
     if (items.count())
     {
-        DirItemInfo destination(m_path);
-        DirItemInfo origin(DirItemInfo(items.at(0)).absolutePath());
-        ActionType actionType  = ActionMove;
-        static QString titleError     = tr("Cannot move items");
-        static QString noWriteError   = tr("no write permission on folder ");
-        //we allow Copy to backup items, but Cut must Fail
-        if (destination.absoluteFilePath() == origin.absoluteFilePath())
-        {
-            emit error(titleError,
-                       tr("origin and destination folders are the same"));
-            return;
-        }
-        // cut needs write permission on origin
-        if (!origin.isWritable())
-        {
-            emit error(titleError, noWriteError + origin.absoluteFilePath());
-            return;
-        }        
-        if (!destination.isWritable())
-        {
-            emit error(titleError, noWriteError + destination.absoluteFilePath());
-            return;
-        }
-        createAndProcessAction(actionType, items);
+        createAndProcessAction(ActionMove, items);
     }
 }