diff options
author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-15 20:12:01 +0200 |
---|---|---|
committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-15 20:12:01 +0200 |
commit | 56a37d315b6bd314f90b113a88241a706373f5d8 (patch) | |
tree | dec29d78544dfcab920a3f909545d7cc2d453281 | |
parent | bb71fd6d02fd829542277129e022ef4dae840e1d (diff) | |
parent | 0cebb16e7c56da94c88cf4f06aeebc3e6400ca03 (diff) | |
download | nextcloud-server-56a37d315b6bd314f90b113a88241a706373f5d8.tar.gz nextcloud-server-56a37d315b6bd314f90b113a88241a706373f5d8.zip |
Merge pull request #24017 from owncloud/share-permissions-namespace
Move share-permissions property namespace
-rw-r--r-- | apps/dav/lib/connector/sabre/filesplugin.php | 2 | ||||
-rw-r--r-- | build/integration/features/sharing-v1.feature | 40 |
2 files changed, 21 insertions, 21 deletions
diff --git a/apps/dav/lib/connector/sabre/filesplugin.php b/apps/dav/lib/connector/sabre/filesplugin.php index 444e80d4ae0..686d0863f91 100644 --- a/apps/dav/lib/connector/sabre/filesplugin.php +++ b/apps/dav/lib/connector/sabre/filesplugin.php @@ -47,7 +47,7 @@ class FilesPlugin extends ServerPlugin { const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id'; const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid'; const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions'; - const SHARE_PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}share-permissions'; + const SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-collaboration-services.org/ns}share-permissions'; const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL'; const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size'; const GETETAG_PROPERTYNAME = '{DAV:}getetag'; diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature index cc591dd51d6..e0bd18078b0 100644 --- a/build/integration/features/sharing-v1.feature +++ b/build/integration/features/sharing-v1.feature @@ -571,8 +571,8 @@ Feature: sharing Given user "user0" exists And User "user0" uploads file with content "foo" to "/tmp.txt" When as "user0" gets properties of folder "/tmp.txt" with - |{http://owncloud.org/ns}share-permissions| - Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "19" + |{http://open-collaboration-services.org/ns}share-permissions | + Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "19" Scenario: Correct webdav share-permissions for received file with edit and reshare permissions Given user "user0" exists @@ -580,8 +580,8 @@ Feature: sharing And User "user0" uploads file with content "foo" to "/tmp.txt" And file "tmp.txt" of user "user0" is shared with user "user1" When as "user1" gets properties of folder "/tmp.txt" with - |{http://owncloud.org/ns}share-permissions| - Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "19" + |{http://open-collaboration-services.org/ns}share-permissions | + Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "19" Scenario: Correct webdav share-permissions for received file with edit permissions but no reshare permissions Given user "user0" exists @@ -592,8 +592,8 @@ Feature: sharing And Updating last share with | permissions | 3 | When as "user1" gets properties of folder "/tmp.txt" with - |{http://owncloud.org/ns}share-permissions| - Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "3" + |{http://open-collaboration-services.org/ns}share-permissions | + Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "3" Scenario: Correct webdav share-permissions for received file with reshare permissions but no edit permissions Given user "user0" exists @@ -604,15 +604,15 @@ Feature: sharing And Updating last share with | permissions | 17 | When as "user1" gets properties of folder "/tmp.txt" with - |{http://owncloud.org/ns}share-permissions| - Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "17" + |{http://open-collaboration-services.org/ns}share-permissions | + Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "17" Scenario: Correct webdav share-permissions for owned folder Given user "user0" exists And user "user0" created a folder "/tmp" When as "user0" gets properties of folder "/" with - |{http://owncloud.org/ns}share-permissions| - Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "31" + |{http://open-collaboration-services.org/ns}share-permissions | + Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "31" Scenario: Correct webdav share-permissions for received folder with all permissions Given user "user0" exists @@ -620,8 +620,8 @@ Feature: sharing And user "user0" created a folder "/tmp" And file "/tmp" of user "user0" is shared with user "user1" When as "user1" gets properties of folder "/tmp" with - |{http://owncloud.org/ns}share-permissions| - Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "31" + |{http://open-collaboration-services.org/ns}share-permissions | + Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "31" Scenario: Correct webdav share-permissions for received folder with all permissions but edit Given user "user0" exists @@ -632,8 +632,8 @@ Feature: sharing And Updating last share with | permissions | 29 | When as "user1" gets properties of folder "/tmp" with - |{http://owncloud.org/ns}share-permissions| - Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "29" + |{http://open-collaboration-services.org/ns}share-permissions | + Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "29" Scenario: Correct webdav share-permissions for received folder with all permissions but create Given user "user0" exists @@ -644,8 +644,8 @@ Feature: sharing And Updating last share with | permissions | 27 | When as "user1" gets properties of folder "/tmp" with - |{http://owncloud.org/ns}share-permissions| - Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "27" + |{http://open-collaboration-services.org/ns}share-permissions | + Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "27" Scenario: Correct webdav share-permissions for received folder with all permissions but delete Given user "user0" exists @@ -656,8 +656,8 @@ Feature: sharing And Updating last share with | permissions | 23 | When as "user1" gets properties of folder "/tmp" with - |{http://owncloud.org/ns}share-permissions| - Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "23" + |{http://open-collaboration-services.org/ns}share-permissions | + Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "23" Scenario: Correct webdav share-permissions for received folder with all permissions but share Given user "user0" exists @@ -668,8 +668,8 @@ Feature: sharing And Updating last share with | permissions | 15 | When as "user1" gets properties of folder "/tmp" with - |{http://owncloud.org/ns}share-permissions| - Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "15" + |{http://open-collaboration-services.org/ns}share-permissions | + Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "15" Scenario: unique target names for incomming shares Given user "user0" exists |