Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
0cebb16e
Unverified
Commit
0cebb16e
authored
9 years ago
by
Roeland Jago Douma
Browse files
Options
Downloads
Patches
Plain Diff
Move share-permissions property namespace
Fixes
https://github.com/owncloud/core/issues/23741
parent
3ffe1f2e
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/dav/lib/connector/sabre/filesplugin.php
+1
-1
1 addition, 1 deletion
apps/dav/lib/connector/sabre/filesplugin.php
build/integration/features/sharing-v1.feature
+20
-20
20 additions, 20 deletions
build/integration/features/sharing-v1.feature
with
21 additions
and
21 deletions
apps/dav/lib/connector/sabre/filesplugin.php
+
1
−
1
View file @
0cebb16e
...
@@ -47,7 +47,7 @@ class FilesPlugin extends ServerPlugin {
...
@@ -47,7 +47,7 @@ class FilesPlugin extends ServerPlugin {
const
FILEID_PROPERTYNAME
=
'{http://owncloud.org/ns}id'
;
const
FILEID_PROPERTYNAME
=
'{http://owncloud.org/ns}id'
;
const
INTERNAL_FILEID_PROPERTYNAME
=
'{http://owncloud.org/ns}fileid'
;
const
INTERNAL_FILEID_PROPERTYNAME
=
'{http://owncloud.org/ns}fileid'
;
const
PERMISSIONS_PROPERTYNAME
=
'{http://owncloud.org/ns}permissions'
;
const
PERMISSIONS_PROPERTYNAME
=
'{http://owncloud.org/ns}permissions'
;
const
SHARE_PERMISSIONS_PROPERTYNAME
=
'{http://o
wncloud
.org/ns}share-permissions'
;
const
SHARE_PERMISSIONS_PROPERTYNAME
=
'{http://o
pen-collaboration-services
.org/ns}share-permissions'
;
const
DOWNLOADURL_PROPERTYNAME
=
'{http://owncloud.org/ns}downloadURL'
;
const
DOWNLOADURL_PROPERTYNAME
=
'{http://owncloud.org/ns}downloadURL'
;
const
SIZE_PROPERTYNAME
=
'{http://owncloud.org/ns}size'
;
const
SIZE_PROPERTYNAME
=
'{http://owncloud.org/ns}size'
;
const
GETETAG_PROPERTYNAME
=
'{DAV:}getetag'
;
const
GETETAG_PROPERTYNAME
=
'{DAV:}getetag'
;
...
...
This diff is collapsed.
Click to expand it.
build/integration/features/sharing-v1.feature
+
20
−
20
View file @
0cebb16e
...
@@ -571,8 +571,8 @@ Feature: sharing
...
@@ -571,8 +571,8 @@ Feature: sharing
Given
user
"user0"
exists
Given
user
"user0"
exists
And
User
"user0"
uploads file with content
"foo"
to
"/tmp.txt"
And
User
"user0"
uploads file with content
"foo"
to
"/tmp.txt"
When
as
"user0"
gets properties of folder
"/tmp.txt"
with
When
as
"user0"
gets properties of folder
"/tmp.txt"
with
|
{http://o
wncloud
.org/ns}share-permissions
|
|
{http://o
pen-collaboration-services
.org/ns}share-permissions
|
Then
the
single
response
should
contain
a
property
"{http://o
wncloud
.org/ns}share-permissions"
with
value
"19"
Then
the
single
response
should
contain
a
property
"{http://o
pen-collaboration-services
.org/ns}share-permissions"
with
value
"19"
Scenario
:
Correct webdav share-permissions for received file with edit and reshare permissions
Scenario
:
Correct webdav share-permissions for received file with edit and reshare permissions
Given
user
"user0"
exists
Given
user
"user0"
exists
...
@@ -580,8 +580,8 @@ Feature: sharing
...
@@ -580,8 +580,8 @@ Feature: sharing
And
User
"user0"
uploads file with content
"foo"
to
"/tmp.txt"
And
User
"user0"
uploads file with content
"foo"
to
"/tmp.txt"
And
file
"tmp.txt"
of user
"user0"
is shared with user
"user1"
And
file
"tmp.txt"
of user
"user0"
is shared with user
"user1"
When
as
"user1"
gets properties of folder
"/tmp.txt"
with
When
as
"user1"
gets properties of folder
"/tmp.txt"
with
|
{http://o
wncloud
.org/ns}share-permissions
|
|
{http://o
pen-collaboration-services
.org/ns}share-permissions
|
Then
the
single
response
should
contain
a
property
"{http://o
wncloud
.org/ns}share-permissions"
with
value
"19"
Then
the
single
response
should
contain
a
property
"{http://o
pen-collaboration-services
.org/ns}share-permissions"
with
value
"19"
Scenario
:
Correct webdav share-permissions for received file with edit permissions but no reshare permissions
Scenario
:
Correct webdav share-permissions for received file with edit permissions but no reshare permissions
Given
user
"user0"
exists
Given
user
"user0"
exists
...
@@ -592,8 +592,8 @@ Feature: sharing
...
@@ -592,8 +592,8 @@ Feature: sharing
And
Updating last share with
And
Updating last share with
|
permissions
|
3
|
|
permissions
|
3
|
When
as
"user1"
gets
properties
of
folder
"/tmp.txt"
with
When
as
"user1"
gets
properties
of
folder
"/tmp.txt"
with
|
{http://o
wncloud
.org/ns}share-permissions
|
|
{http://o
pen-collaboration-services
.org/ns}share-permissions
|
Then the single response should contain a property "{http
:
//o
wncloud
.org/ns}share-permissions"
with
value
"3"
Then the single response should contain a property "{http
:
//o
pen-collaboration-services
.org/ns}share-permissions"
with
value
"3"
Scenario
:
Correct webdav share-permissions for received file with reshare permissions but no edit permissions
Scenario
:
Correct webdav share-permissions for received file with reshare permissions but no edit permissions
Given
user
"user0"
exists
Given
user
"user0"
exists
...
@@ -604,15 +604,15 @@ Feature: sharing
...
@@ -604,15 +604,15 @@ Feature: sharing
And
Updating last share with
And
Updating last share with
|
permissions
|
17
|
|
permissions
|
17
|
When
as
"user1"
gets
properties
of
folder
"/tmp.txt"
with
When
as
"user1"
gets
properties
of
folder
"/tmp.txt"
with
|
{http://o
wncloud
.org/ns}share-permissions
|
|
{http://o
pen-collaboration-services
.org/ns}share-permissions
|
Then the single response should contain a property "{http
:
//o
wncloud
.org/ns}share-permissions"
with
value
"17"
Then the single response should contain a property "{http
:
//o
pen-collaboration-services
.org/ns}share-permissions"
with
value
"17"
Scenario
:
Correct webdav share-permissions for owned folder
Scenario
:
Correct webdav share-permissions for owned folder
Given
user
"user0"
exists
Given
user
"user0"
exists
And
user
"user0"
created a folder
"/tmp"
And
user
"user0"
created a folder
"/tmp"
When
as
"user0"
gets properties of folder
"/"
with
When
as
"user0"
gets properties of folder
"/"
with
|
{http://o
wncloud
.org/ns}share-permissions
|
|
{http://o
pen-collaboration-services
.org/ns}share-permissions
|
Then
the
single
response
should
contain
a
property
"{http://o
wncloud
.org/ns}share-permissions"
with
value
"31"
Then
the
single
response
should
contain
a
property
"{http://o
pen-collaboration-services
.org/ns}share-permissions"
with
value
"31"
Scenario
:
Correct webdav share-permissions for received folder with all permissions
Scenario
:
Correct webdav share-permissions for received folder with all permissions
Given
user
"user0"
exists
Given
user
"user0"
exists
...
@@ -620,8 +620,8 @@ Feature: sharing
...
@@ -620,8 +620,8 @@ Feature: sharing
And
user
"user0"
created a folder
"/tmp"
And
user
"user0"
created a folder
"/tmp"
And
file
"/tmp"
of user
"user0"
is shared with user
"user1"
And
file
"/tmp"
of user
"user0"
is shared with user
"user1"
When
as
"user1"
gets properties of folder
"/tmp"
with
When
as
"user1"
gets properties of folder
"/tmp"
with
|
{http://o
wncloud
.org/ns}share-permissions
|
|
{http://o
pen-collaboration-services
.org/ns}share-permissions
|
Then
the
single
response
should
contain
a
property
"{http://o
wncloud
.org/ns}share-permissions"
with
value
"31"
Then
the
single
response
should
contain
a
property
"{http://o
pen-collaboration-services
.org/ns}share-permissions"
with
value
"31"
Scenario
:
Correct webdav share-permissions for received folder with all permissions but edit
Scenario
:
Correct webdav share-permissions for received folder with all permissions but edit
Given
user
"user0"
exists
Given
user
"user0"
exists
...
@@ -632,8 +632,8 @@ Feature: sharing
...
@@ -632,8 +632,8 @@ Feature: sharing
And
Updating last share with
And
Updating last share with
|
permissions
|
29
|
|
permissions
|
29
|
When
as
"user1"
gets
properties
of
folder
"/tmp"
with
When
as
"user1"
gets
properties
of
folder
"/tmp"
with
|
{http://o
wncloud
.org/ns}share-permissions
|
|
{http://o
pen-collaboration-services
.org/ns}share-permissions
|
Then the single response should contain a property "{http
:
//o
wncloud
.org/ns}share-permissions"
with
value
"29"
Then the single response should contain a property "{http
:
//o
pen-collaboration-services
.org/ns}share-permissions"
with
value
"29"
Scenario
:
Correct webdav share-permissions for received folder with all permissions but create
Scenario
:
Correct webdav share-permissions for received folder with all permissions but create
Given
user
"user0"
exists
Given
user
"user0"
exists
...
@@ -644,8 +644,8 @@ Feature: sharing
...
@@ -644,8 +644,8 @@ Feature: sharing
And
Updating last share with
And
Updating last share with
|
permissions
|
27
|
|
permissions
|
27
|
When
as
"user1"
gets
properties
of
folder
"/tmp"
with
When
as
"user1"
gets
properties
of
folder
"/tmp"
with
|
{http://o
wncloud
.org/ns}share-permissions
|
|
{http://o
pen-collaboration-services
.org/ns}share-permissions
|
Then the single response should contain a property "{http
:
//o
wncloud
.org/ns}share-permissions"
with
value
"27"
Then the single response should contain a property "{http
:
//o
pen-collaboration-services
.org/ns}share-permissions"
with
value
"27"
Scenario
:
Correct webdav share-permissions for received folder with all permissions but delete
Scenario
:
Correct webdav share-permissions for received folder with all permissions but delete
Given
user
"user0"
exists
Given
user
"user0"
exists
...
@@ -656,8 +656,8 @@ Feature: sharing
...
@@ -656,8 +656,8 @@ Feature: sharing
And
Updating last share with
And
Updating last share with
|
permissions
|
23
|
|
permissions
|
23
|
When
as
"user1"
gets
properties
of
folder
"/tmp"
with
When
as
"user1"
gets
properties
of
folder
"/tmp"
with
|
{http://o
wncloud
.org/ns}share-permissions
|
|
{http://o
pen-collaboration-services
.org/ns}share-permissions
|
Then the single response should contain a property "{http
:
//o
wncloud
.org/ns}share-permissions"
with
value
"23"
Then the single response should contain a property "{http
:
//o
pen-collaboration-services
.org/ns}share-permissions"
with
value
"23"
Scenario
:
Correct webdav share-permissions for received folder with all permissions but share
Scenario
:
Correct webdav share-permissions for received folder with all permissions but share
Given
user
"user0"
exists
Given
user
"user0"
exists
...
@@ -668,8 +668,8 @@ Feature: sharing
...
@@ -668,8 +668,8 @@ Feature: sharing
And
Updating last share with
And
Updating last share with
|
permissions
|
15
|
|
permissions
|
15
|
When
as
"user1"
gets
properties
of
folder
"/tmp"
with
When
as
"user1"
gets
properties
of
folder
"/tmp"
with
|
{http://o
wncloud
.org/ns}share-permissions
|
|
{http://o
pen-collaboration-services
.org/ns}share-permissions
|
Then the single response should contain a property "{http
:
//o
wncloud
.org/ns}share-permissions"
with
value
"15"
Then the single response should contain a property "{http
:
//o
pen-collaboration-services
.org/ns}share-permissions"
with
value
"15"
Scenario
:
unique target names for incomming shares
Scenario
:
unique target names for incomming shares
Given
user
"user0"
exists
Given
user
"user0"
exists
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment