Move profile and settings into the new unified dashboard, showing user info in one place
This commit is contained in:
parent
2d826734a0
commit
7edefe23c3
37 changed files with 726 additions and 500 deletions
116
trades/views.py
116
trades/views.py
|
|
@ -104,120 +104,11 @@ class TradeOfferAllListView(ListView):
|
|||
paginated_offers = Paginator(queryset, 10).get_page(page)
|
||||
return render(
|
||||
self.request,
|
||||
"trades/_trade_offer_list_paginated.html",
|
||||
"trades/_trade_offer_list.html",
|
||||
{"offers": paginated_offers}
|
||||
)
|
||||
return super().render_to_response(context, **response_kwargs)
|
||||
|
||||
class TradeOfferMyListView(LoginRequiredMixin, FriendCodeRequiredMixin, ListView):
|
||||
model = TradeOffer
|
||||
template_name = "trades/trade_offer_my_list.html"
|
||||
|
||||
def get_selected_friend_code(self):
|
||||
friend_codes = self.request.user.friend_codes.all()
|
||||
friend_code_param = self.request.GET.get("friend_code")
|
||||
if friend_code_param:
|
||||
try:
|
||||
selected_friend_code = friend_codes.get(pk=friend_code_param)
|
||||
except friend_codes.model.DoesNotExist:
|
||||
selected_friend_code = self.request.user.default_friend_code or friend_codes.first()
|
||||
else:
|
||||
selected_friend_code = self.request.user.default_friend_code or friend_codes.first()
|
||||
if not selected_friend_code:
|
||||
raise PermissionDenied("You do not have an active friend code associated with your account.")
|
||||
return selected_friend_code
|
||||
|
||||
def get_show_closed(self):
|
||||
return self.request.GET.get("show_closed", "false").lower() == "true"
|
||||
|
||||
def get_my_trade_offers_paginated(self, page_param):
|
||||
selected_friend_code = self.get_selected_friend_code()
|
||||
queryset = self.get_queryset().filter(initiated_by=selected_friend_code)
|
||||
if self.get_show_closed():
|
||||
queryset = queryset.filter(is_closed=True)
|
||||
else:
|
||||
queryset = queryset.filter(is_closed=False)
|
||||
return Paginator(queryset, 10).get_page(page_param)
|
||||
|
||||
def get_involved_acceptances(self, selected_friend_code):
|
||||
terminal_states = [
|
||||
TradeAcceptance.AcceptanceState.THANKED_BY_INITIATOR,
|
||||
TradeAcceptance.AcceptanceState.THANKED_BY_ACCEPTOR,
|
||||
TradeAcceptance.AcceptanceState.THANKED_BY_BOTH,
|
||||
TradeAcceptance.AcceptanceState.REJECTED_BY_INITIATOR,
|
||||
TradeAcceptance.AcceptanceState.REJECTED_BY_ACCEPTOR,
|
||||
]
|
||||
involved_acceptances_qs = TradeAcceptance.objects.filter(
|
||||
Q(trade_offer__initiated_by=selected_friend_code) | Q(accepted_by=selected_friend_code)
|
||||
).order_by("-updated_at")
|
||||
if self.get_show_closed():
|
||||
return involved_acceptances_qs.filter(state__in=terminal_states)
|
||||
return involved_acceptances_qs.exclude(state__in=terminal_states)
|
||||
|
||||
def get_trade_acceptances_waiting_paginated(self, page_param):
|
||||
selected_friend_code = self.get_selected_friend_code()
|
||||
involved_acceptances = self.get_involved_acceptances(selected_friend_code)
|
||||
waiting_acceptances = involved_acceptances.filter(
|
||||
Q(trade_offer__initiated_by=selected_friend_code, state__in=[
|
||||
TradeAcceptance.AcceptanceState.ACCEPTED,
|
||||
TradeAcceptance.AcceptanceState.RECEIVED,
|
||||
]) |
|
||||
Q(accepted_by=selected_friend_code, state__in=[TradeAcceptance.AcceptanceState.SENT])
|
||||
)
|
||||
return Paginator(waiting_acceptances, 10).get_page(page_param)
|
||||
|
||||
def get_other_party_trade_acceptances_paginated(self, page_param):
|
||||
selected_friend_code = self.get_selected_friend_code()
|
||||
involved_acceptances = self.get_involved_acceptances(selected_friend_code)
|
||||
waiting_acceptances = involved_acceptances.filter(
|
||||
Q(trade_offer__initiated_by=selected_friend_code, state__in=[
|
||||
TradeAcceptance.AcceptanceState.ACCEPTED,
|
||||
TradeAcceptance.AcceptanceState.RECEIVED,
|
||||
]) |
|
||||
Q(accepted_by=selected_friend_code, state__in=[TradeAcceptance.AcceptanceState.SENT])
|
||||
)
|
||||
other_acceptances = involved_acceptances.exclude(pk__in=waiting_acceptances.values("pk"))
|
||||
return Paginator(other_acceptances, 10).get_page(page_param)
|
||||
|
||||
#@silk_profile(name="Trade Offer My List- Get Context Data")
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
request = self.request
|
||||
show_closed = self.get_show_closed()
|
||||
context["show_closed"] = show_closed
|
||||
|
||||
selected_friend_code = self.get_selected_friend_code()
|
||||
context["selected_friend_code"] = selected_friend_code
|
||||
context["friend_codes"] = request.user.friend_codes.all()
|
||||
|
||||
# Use request params for initial full page load (could be None)
|
||||
offers_page = request.GET.get("offers_page")
|
||||
waiting_page = request.GET.get("waiting_page")
|
||||
other_page = request.GET.get("other_page")
|
||||
context["my_trade_offers_paginated"] = self.get_my_trade_offers_paginated(offers_page)
|
||||
context["trade_acceptances_waiting_paginated"] = self.get_trade_acceptances_waiting_paginated(waiting_page)
|
||||
context["other_party_trade_acceptances_paginated"] = self.get_other_party_trade_acceptances_paginated(other_page)
|
||||
|
||||
return context
|
||||
|
||||
#@silk_profile(name="Trade Offer My List- Render to Response")
|
||||
def render_to_response(self, context, **response_kwargs):
|
||||
# For AJAX requests, return only the paginated fragment.
|
||||
if self.request.headers.get("X-Requested-With") == "XMLHttpRequest":
|
||||
ajax_section = self.request.GET.get("ajax_section")
|
||||
page = self.request.GET.get("page")
|
||||
if ajax_section == "my_trade_offers":
|
||||
offers = self.get_my_trade_offers_paginated(page)
|
||||
elif ajax_section == "waiting_acceptances":
|
||||
offers = self.get_trade_acceptances_waiting_paginated(page)
|
||||
elif ajax_section == "other_party_acceptances":
|
||||
offers = self.get_other_party_trade_acceptances_paginated(page)
|
||||
else:
|
||||
# Fallback to my trade offers.
|
||||
offers = self.get_my_trade_offers_paginated(page)
|
||||
return render(self.request, "trades/_trade_offer_list_paginated.html", {"offers": offers})
|
||||
return super().render_to_response(context, **response_kwargs)
|
||||
|
||||
class TradeOfferDeleteView(LoginRequiredMixin, FriendCodeRequiredMixin, DeleteView):
|
||||
model = TradeOffer
|
||||
success_url = reverse_lazy("trade_offer_list")
|
||||
|
|
@ -526,6 +417,8 @@ class TradeAcceptanceCreateView(LoginRequiredMixin, FriendCodeRequiredMixin, Cre
|
|||
|
||||
def form_valid(self, form):
|
||||
form.instance.trade_offer = self.trade_offer
|
||||
# Set the actioning user before saving
|
||||
form.instance._actioning_user = self.request.user
|
||||
self.object = form.save()
|
||||
return HttpResponseRedirect(self.get_success_url())
|
||||
|
||||
|
|
@ -616,7 +509,6 @@ class TradeOfferPNGView(View):
|
|||
# If the image is already generated and stored, serve it directly.
|
||||
if trade_offer.image:
|
||||
trade_offer.image.open()
|
||||
print(f"Serving cached image for trade offer {trade_offer.pk}")
|
||||
return HttpResponse(trade_offer.image.read(), content_type="image/png")
|
||||
|
||||
# Acquire PostgreSQL advisory lock to prevent concurrent generation.
|
||||
|
|
@ -629,10 +521,8 @@ class TradeOfferPNGView(View):
|
|||
trade_offer.refresh_from_db()
|
||||
if trade_offer.image:
|
||||
trade_offer.image.open()
|
||||
print(f"Serving recently-cached image for trade offer {trade_offer.pk}")
|
||||
return HttpResponse(trade_offer.image.read(), content_type="image/png")
|
||||
|
||||
print(f"Generating PNG for trade offer {trade_offer.pk}")
|
||||
# Generate PNG using Playwright as before.
|
||||
from trades.templatetags import trade_offer_tags
|
||||
tag_context = trade_offer_tags.render_trade_offer_png(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue