Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set etag and permission fields for trashbin entries #21544

Merged
merged 1 commit into from Jan 15, 2016

Conversation

icewind1991
Copy link
Contributor

Properly set all the fields that are expected

Fixes #21378

cc @PVince81 @schiesbn

@icewind1991 icewind1991 added this to the 9.0-current milestone Jan 8, 2016
@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @PVince81, @schiesbn and @Xenopathic to be potential reviewers

@PVince81
Copy link
Contributor

PVince81 commented Jan 8, 2016

👍 as discussed

@@ -91,6 +92,8 @@ public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDesc
'type' => $view->is_dir($dir . '/' . $entryName) ? 'dir' : 'file',
'directory' => ($dir === '/') ? '' : $dir,
'size' => $size,
'etag' => '',
'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Files can't have create permissions.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So nothing bad really happens probably. But for cleanness.

@PVince81
Copy link
Contributor

{... ,"app":"PHP","message":"Class 'OCA\Files_Trashbin\Constants' not found at \/var\/www\/owncloud\/apps\/files_trashbin\/lib\/helper.php#95","level":3,"time":"2016-01-10T21:42:55+01:00"}

@icewind1991
Copy link
Contributor Author

+use OCP\Constants;

...

@PVince81
Copy link
Contributor

Yep, works indeed.

@DeepDiver1975
Copy link
Member

👍

DeepDiver1975 added a commit that referenced this pull request Jan 15, 2016
set etag and permission fields for trashbin entries
@DeepDiver1975 DeepDiver1975 merged commit 13ce6d0 into master Jan 15, 2016
@DeepDiver1975 DeepDiver1975 deleted the trashbin-permissions branch January 15, 2016 12:22
@MorrisJobke
Copy link
Contributor

@karlitschek @icewind1991 Could we backport this to stable8.1 and stable8.2?

@karlitschek
Copy link
Contributor

i think a backport makes sense 👍

@MorrisJobke
Copy link
Contributor

stable8.2 #22571
stable8.1 #22572

@lock
Copy link

lock bot commented Aug 7, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 7, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
7 participants