mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-02-07 06:42:25 +00:00
Code Issues Projects Releases Wiki Activity

allow group members to add items to group lists directly

Browse source 
NOTE: this will be the case regardless of privacy settings of the list
This commit is contained in:
Hugh Rundle 2021-09-27 18:41:29 +10:00
parent 81e5ff5b76
commit c87712c995
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bookwyrm/templates/lists/list.html
View file

@ -123,7 +123,7 @@
</form> </form>
{% if request.user.is_authenticated and not list.curation == 'closed' or request.user == list.user %} {% if request.user.is_authenticated and not list.curation == 'closed' or request.user == list.user %}
<h2 class="title is-5 mt-6"> <h2 class="title is-5 mt-6">
{% if list.curation == 'open' or request.user == list.user %} {% if list.curation == 'open' or request.user == list.user or is_group_member %}
{% trans "Add Books" %} {% trans "Add Books" %}
{% else %} {% else %}
{% trans "Suggest Books" %} {% trans "Suggest Books" %}
@ -176,7 +176,7 @@
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="book" value="{{ book.id }}"> <input type="hidden" name="book" value="{{ book.id }}">
<input type="hidden" name="list" value="{{ list.id }}"> <input type="hidden" name="list" value="{{ list.id }}">
<button type="submit" class="button is-small is-link">{% if list.curation == 'open' or request.user == list.user %}{% trans "Add" %}{% else %}{% trans "Suggest" %}{% endif %}</button> <button type="submit" class="button is-small is-link">{% if list.curation == 'open' or request.user == list.user or is_group_member %}{% trans "Add" %}{% else %}{% trans "Suggest" %}{% endif %}</button>
</form> </form>
</div> </div>
</div> </div>

10
bookwyrm/views/list.py
View file

@ -177,6 +177,7 @@ class List(View):
][: 5 - len(suggestions)] ][: 5 - len(suggestions)]
user_groups = models.Group.objects.filter(members=request.user).order_by("-updated_date") user_groups = models.Group.objects.filter(members=request.user).order_by("-updated_date")
is_group_member = book_list.group in user_groups
page = paginated.get_page(request.GET.get("page")) page = paginated.get_page(request.GET.get("page"))
data = { data = {
"list": book_list, "list": book_list,
@ -191,7 +192,8 @@ class List(View):
"sort_form": forms.SortListForm( "sort_form": forms.SortListForm(
{"direction": direction, "sort_by": sort_by} {"direction": direction, "sort_by": sort_by}
), ),
"user_groups": user_groups "user_groups": user_groups,
"is_group_member": is_group_member
} }
return TemplateResponse(request, "lists/list.html", data) return TemplateResponse(request, "lists/list.html", data)
@ -292,13 +294,17 @@ def delete_list(request, list_id):
def add_book(request): def add_book(request):
"""put a book on a list""" """put a book on a list"""
book_list = get_object_or_404(models.List, id=request.POST.get("list")) book_list = get_object_or_404(models.List, id=request.POST.get("list"))
is_group_member = False
if book_list.curation == "group":
user_groups = models.Group.objects.filter(members=request.user).order_by("-updated_date")
is_group_member = book_list.group in user_groups
if not book_list.visible_to_user(request.user): if not book_list.visible_to_user(request.user):
return HttpResponseNotFound() return HttpResponseNotFound()
book = get_object_or_404(models.Edition, id=request.POST.get("book")) book = get_object_or_404(models.Edition, id=request.POST.get("book"))
# do you have permission to add to the list? # do you have permission to add to the list?
try: try:
if request.user == book_list.user or book_list.curation == "open": if request.user == book_list.user or is_group_member or book_list.curation == "open":
# add the book at the latest order of approved books, before pending books # add the book at the latest order of approved books, before pending books
order_max = ( order_max = (
book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[ book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[