Branch 'kolab/integration/4.13.0' - akonadi/actionstatemanager.cpp akonadi/standardactionmanager.cpp

Christian Mollekopf mollekopf at kolabsys.com
Fri Jan 2 10:42:03 CET 2015


 akonadi/actionstatemanager.cpp    |    5 -----
 akonadi/standardactionmanager.cpp |    5 -----
 2 files changed, 10 deletions(-)

New commits:
commit 3f228a9da9be025c82c888e51c0d560c2994beb6
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Wed Dec 31 14:43:59 2014 +0100

    Ignore contentMimeTypes for createCollection action.
    
    contentMimeTypes are only for items and not collections. Otherwise
    resource collection would have to contain all contentmimetypes of all
    subcollections which is not the case. We therefore only check the acl
    to decide wether we can create new collections.

diff --git a/akonadi/actionstatemanager.cpp b/akonadi/actionstatemanager.cpp
index 3b3813c..97b873b 100644
--- a/akonadi/actionstatemanager.cpp
+++ b/akonadi/actionstatemanager.cpp
@@ -38,11 +38,6 @@ static bool canCreateSubCollection(const Collection &collection)
         return false;
     }
 
-    if (!collection.contentMimeTypes().contains(Collection::mimeType()) &&
-        !collection.contentMimeTypes().contains(Collection::virtualMimeType())) {
-        return false;
-    }
-
     return true;
 }
 
diff --git a/akonadi/standardactionmanager.cpp b/akonadi/standardactionmanager.cpp
index 9cc7f16..5747f59 100644
--- a/akonadi/standardactionmanager.cpp
+++ b/akonadi/standardactionmanager.cpp
@@ -136,11 +136,6 @@ static bool canCreateCollection(const Akonadi::Collection &collection)
         return false;
     }
 
-    if (!collection.contentMimeTypes().contains(Akonadi::Collection::mimeType()) &&
-        !collection.contentMimeTypes().contains(Akonadi::Collection::virtualMimeType())) {
-        return false;
-    }
-
     return true;
 }
 




More information about the commits mailing list