Commit graph

5002 commits

Author SHA1 Message Date
Mouse Reeve 84443c7f81 Custom perms function for shelf view 2021-09-27 15:55:55 -07:00
Mouse Reeve 3f10ae248a Changes visiblity function to raise 2021-09-27 15:54:58 -07:00
Mouse Reeve 3657f9e0df Check perms in status views 2021-09-27 14:03:17 -07:00
Mouse Reeve 556ae0726b Check perms in list views 2021-09-27 14:03:06 -07:00
Mouse Reeve ab31798931 Adds model function to check perms 2021-09-27 14:02:34 -07:00
Mouse Reeve 0f57a43bfb Separate access controls for delete and re-order 2021-09-27 13:31:35 -07:00
Mouse Reeve 10098a402d Don't show list item controls to contributing viewers 2021-09-27 13:25:53 -07:00
Mouse Reeve ab5521480d
Merge pull request #1462 from bookwyrm-social/fewer-active-shelf-queries
Fewer active shelf queries
2021-09-27 13:16:50 -07:00
Mouse Reeve 1efe62a70e Check for readthrough annotation 2021-09-27 13:08:11 -07:00
Mouse Reeve d7a54b0b10 Removes stray print 2021-09-27 12:56:40 -07:00
Mouse Reeve 6d2403bbc7
Merge pull request #1459 from bookwyrm-social/password-reset
Prevent password reset for inactive users
2021-09-27 12:55:05 -07:00
Mouse Reeve 8b0a8e2611 Another user mock on request 2021-09-27 12:38:49 -07:00
Mouse Reeve dd3850a3ba Updates books test 2021-09-27 12:26:56 -07:00
Mouse Reeve 36c00c49ab User viewer aware objects for feed suggested books 2021-09-27 11:37:50 -07:00
Mouse Reeve ba4df5b38b Safely return if there are no current shelves 2021-09-27 11:29:53 -07:00
Mouse Reeve 8e8f46ee51 Only call .all once in shelf view 2021-09-27 11:27:46 -07:00
Mouse Reeve cb089ed817 One query to get book for book view 2021-09-27 11:23:55 -07:00
Mouse Reeve 35131262ff CHeck for current shelves attr before querying for it 2021-09-27 11:17:53 -07:00
Mouse Reeve 995e2c47db User viewer aware objects for book page
Plus other refactors for that view
2021-09-27 11:17:42 -07:00
Mouse Reeve 6d06edc2c7 User viewer aware books for all books shelf view 2021-09-27 10:58:34 -07:00
Mouse Reeve eb34bb2d93
Merge pull request #1461 from bookwyrm-social/views-init
Adds init file to admin views dir
2021-09-27 10:37:23 -07:00
Mouse Reeve e75a49f799
Merge pull request #1455 from bookwyrm-social/refactor-readthroughs
Refactor read-throughs
2021-09-27 10:29:46 -07:00
Mouse Reeve bc87856c2e Merge branch 'main' into book-format-choices 2021-09-27 10:29:12 -07:00
Mouse Reeve 1cb1b29f57 Adds request user to mock 2021-09-27 10:26:25 -07:00
Mouse Reeve 69b010a8d3 f string updates 2021-09-27 10:21:46 -07:00
Mouse Reeve 28d40e9914 Use url names in redirects 2021-09-27 10:17:16 -07:00
Mouse Reeve 92de48afd4 Adds init file to admin views dir
Is this why they're not pylinting?
2021-09-27 10:06:46 -07:00
Mouse Reeve c399d6edfb Prevent password reset for inactive users 2021-09-27 09:31:51 -07:00
Hugh Rundle fb823189a0 don't allow non-local users to join groups (yet)
Groups are not compatible with ActivityPub because I don't know what I'm doing.

NOTE: this is super hacky, fix ASAP
2021-09-27 21:48:40 +10:00
Hugh Rundle e15eef16c5 improve new group member adding
The add-members page now looks almost identical to the group
page and is clearer.
2021-09-27 21:21:00 +10:00
Levi Bard 0e6895633c Allow adding a cover by url when adding a new book (#1443) 2021-09-27 13:00:16 +02:00
Hugh Rundle 1a02af1450 allow members to see groups and their lists
- add additional logic to visible_to_user, for groups and their objects
- cleans up some queries in Group view

NOTE: I can't work out how to make group lists only visible
to users who should be able to see them, on user group listings.
They still can't access the actual group, but can see it on
user pages. This is potentialy problematic.
2021-09-27 20:24:25 +10:00
Hugh Rundle df5a5f94a1 fix local_path for groups 2021-09-27 19:27:39 +10:00
Hugh Rundle c87712c995 allow group members to add items to group lists directly
NOTE: this will be the case regardless of privacy settings of the list
2021-09-27 18:41:29 +10:00
Hugh Rundle 81e5ff5b76 show groups on member pages if allowed
- display groups on user pages when not the logged in user
- restrict visibility of groups on user pages and group pages themselves according to privacy settings
2021-09-27 17:51:18 +10:00
Hugh Rundle 277c033fda show star if this user is the creator/manager of the group 2021-09-27 17:50:38 +10:00
Hugh Rundle e5ca377cd3 clean up stray code mess 2021-09-27 16:50:51 +10:00
Hugh Rundle e38d7b63f3 make groups actually editable 2021-09-27 16:49:56 +10:00
Hugh Rundle 493ed14f34 better group creation form logic and placement 2021-09-27 16:39:12 +10:00
Hugh Rundle 0ccd54b05a better urls and views for group creation and editing 2021-09-27 15:38:05 +10:00
Hugh Rundle f3181690a2 change group owner from 'manager' to 'user'
This will allow privacy management to use existing code.
Some template updates also are for rationalising how
groups are created and edited.
2021-09-27 15:36:41 +10:00
Hugh Rundle 2874e52309 rationalise group creation and prep for group privacy 2021-09-27 15:34:14 +10:00
Hugh Rundle 762202c4b0 fix UI for group curated list editing
When creating or editing a list, the group selection dropdown will only appear if the user selects "group" as the curation option (or it is already selected).

- fix typo in bookwyrm.js comments
- add data-hides trigger for hiding elements after they have been unhidden, where simple toggles are not the right approach
2021-09-27 11:03:41 +10:00
Hugh Rundle 0e2095bc5e refer to group in group lists created_text 2021-09-26 20:52:44 +10:00
Hugh Rundle 5fccb991a7 remove list from group when changing curation
Allows 'group' to be blank when saving a list.
Removes the 'group' field when saving a list with curation other than 'group' - this stops the list "sticking" to a group after it is changed from group curation to something else.
2021-09-26 18:28:16 +10:00
Hugh Rundle 8bfc71db6e create group curated lists 2021-09-26 15:56:52 +10:00
Hugh Rundle f3a3ba5f01 pass group value to list views and vice-versa 2021-09-26 15:56:02 +10:00
Hugh Rundle b921d666cf add group field to ListForm 2021-09-26 15:55:16 +10:00
Hugh Rundle 686198472d update group and list models
- remove GroupList model
- add a group foreign key value  to List model
- remove reference to lists in Group model
2021-09-26 15:50:15 +10:00
Hugh Rundle ec0720514e don't allow non-manager to add and remove group members 2021-09-25 20:25:30 +10:00