Commit Graph

35 Commits

Author SHA1 Message Date
Louis cb6acf8588
Merge pull request #1600 from simonspa/p/fix-group-sharing
Fix sharing with group
2023-01-24 07:37:50 +01:00
Simon Spannagel f3365d9ef7 Go for === in favor of strcmp for clarity
Signed-off-by: Simon Spannagel <simonspa@kth.se>
2023-01-24 07:13:58 +01:00
Simon Spannagel 69dcd886b0 Fix sharing with individual user
Signed-off-by: Simon Spannagel <simonspa@kth.se>
2023-01-24 07:13:58 +01:00
Simon Spannagel bff6581467 Fix comparisons in isCollaborator
Signed-off-by: Simon Spannagel <simonspa@kth.se>
2023-01-24 07:13:58 +01:00
Simon Spannagel 7059fa97b1 AlbumMapper: add method to check if user is collaborator for album
Signed-off-by: Simon Spannagel <simonspa@kth.se>
2023-01-24 07:13:58 +01:00
Simon Spannagel 4e6a6627ae reuse user delete method to remove collaborators
Signed-off-by: Simon Spannagel <simonspa@kth.se>
2023-01-24 07:13:07 +01:00
Simon Spannagel b7c2d61432 Remove photos from user if they removed themselves
Signed-off-by: Simon Spannagel <simonspa@kth.se>
2023-01-24 07:13:07 +01:00
Simon Spannagel 436c40cc92 Shared albums: remove photos from collaborators when removed
Signed-off-by: Simon Spannagel <simonspa@kth.se>
2023-01-24 07:13:07 +01:00
Louis Chemineau 20e3e61ad5 Add primary key index to collaborators table
- Create new `photos_albums_collabs` table
     - with an `id` auto-incremented column
     - with a primary key using the `id` column
     - with a unique index instead of a unique constraint
- Move data from `photos_collaborators` to `photos_albums_collabs`
- Delete `photos_collaborators` table

Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-11-03 12:58:33 +01:00
Louis Chemineau 8dcc543386 Fix logic of share album content fetching
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-10-19 16:40:45 +02:00
Louis Chemineau b93db5fc8e Fix e2e tests
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-10-10 20:10:03 +02:00
Louis Chemineau 142fe83638 Make public pages work
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-10-10 12:23:52 +02:00
Louis Chemineau 57373f329a Cleaning before review
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-10-10 12:23:52 +02:00
Louis Chemineau e88d44909d Revert "Display album's name instead of token"
This reverts commit 2de383f22f04d82c14696f4f084c0e2c592d3d1f.

Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-10-10 12:23:52 +02:00
Louis Chemineau a7979d22ab Generate token in the backend
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-10-10 12:23:52 +02:00
Louis Chemineau bb97d6eb84 Apply review suggestions
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-10-10 12:23:52 +02:00
Louis Chemineau 5dfa6df07a Display album's name instead of token
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-10-10 12:23:52 +02:00
Louis Chemineau ff01726c6b Add public link logic
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-10-10 12:23:52 +02:00
Louis Chemineau 769064eecd Fix psalm errors
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-09-27 11:37:04 +02:00
John Molakvoæ 804b92fcf4
Do not get all the files list when fetching the albums list
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2022-09-23 10:39:57 +02:00
Louis Chemineau b1e99c1d08 Allow album owner to get file added by collaborators
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-09-20 13:31:00 +02:00
Louis 49b937a203
Merge pull request #1247 from nextcloud/polish/albums
Polish albums - second round
2022-09-20 11:41:49 +02:00
Louis Chemineau cdf57cbf60 Support receiving two albums with the same names
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-09-20 10:50:14 +02:00
Louis Chemineau 8b1d98e523 Disambiguate `album_id` on group by
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-09-20 10:45:27 +02:00
Louis Chemineau f8b106783e Add public sharing
Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2022-09-16 15:31:00 +00:00
Louis Chemineau 73e726a3dc Rename collaborator.source to .type
And do the mapping in the frontend

Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-09-16 14:41:29 +02:00
Louis Chemineau 58947bb618 Use album owner if album file owner is null
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-09-16 14:41:29 +02:00
Louis Chemineau 331e2c742f Overall polishing of backend code for albums
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-09-16 14:41:29 +02:00
Louis Chemineau 35af106097 Add collaborators management views
Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2022-09-16 07:44:28 +00:00
Louis Chemineau 2ed149136b
Handle node deletion event
To remove files from album when they are deleted.

Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-09-09 08:14:01 +02:00
Robin Appelman f4dea80783 store album location and last added photo
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-08-22 20:03:52 +02:00
Robin Appelman 6bb2c7a864 cast to int
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-08-22 20:03:52 +02:00
Robin Appelman 3b62ffb0f9 better error for duplicate
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-08-22 20:03:52 +02:00
Robin Appelman 4aa8a0a78f retreive more metadata for album files
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-08-22 20:03:51 +02:00
Robin Appelman 10f44aacc8 add album database management bits
Signed-off-by: Louis Chemineau <louis@chmn.me>
2022-08-22 20:03:51 +02:00