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

Circles files panel (#137) #141

Merged
merged 13 commits into from
Nov 7, 2017

Conversation

viniciuscb
Copy link
Member

Proposal and discussion at #137

viniciuscb and others added 9 commits September 11, 2017 15:31
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
This commit inserts a panel in files visualization to allow filtering files that were shared to one or more circles.
Depends on some other modifications in nextcloud core, that will be referenced in the PR.

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
Files-circles-panel: in javascript interface, just show the circles that the current user is member of.

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
This reverts commit cfffcd6.

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
@@ -534,7 +534,7 @@ private function joinShare(IQueryBuilder &$qb) {
$qb->addSelect('s.file_source', 's.file_target');
/** @noinspection PhpMethodParametersCountMismatchInspection */
$qb->from('share', 's')
->andWhere($expr->eq('s.share_type', $qb->createNamedParameter(Share::SHARE_TYPE_CIRCLE)))
->where($expr->eq('s.share_type', $qb->createNamedParameter(Share::SHARE_TYPE_CIRCLE)))
Copy link
Member

Choose a reason for hiding this comment

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

my bad, monday morning...

@ArtificialOwl ArtificialOwl merged commit 6b92706 into nextcloud:master Nov 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants