all cards of a trade offer are now ordered alphabetically. fixes #12

This commit is contained in:
badblocks 2025-04-08 23:00:49 -07:00
parent b5db5af185
commit 1c95ccfff7
2 changed files with 14 additions and 19 deletions

View file

@ -61,26 +61,9 @@ class TradeAcceptanceCreateForm(forms.ModelForm):
TradeAcceptance.AcceptanceState.SENT,
TradeAcceptance.AcceptanceState.RECEIVED,
]
available_requested_ids = []
for through_obj in trade_offer.have_cards_available:
active_count = trade_offer.acceptances.filter(
requested_card=through_obj.card,
state__in=active_states
).count()
if active_count < through_obj.quantity:
available_requested_ids.append(through_obj.card.id)
self.fields["requested_card"].queryset = Card.objects.filter(id__in=available_requested_ids)
self.fields["requested_card"].queryset = trade_offer.have_cards_available_qs
# Update available offered_card choices from the TradeOffer's "want" side.
available_offered_ids = []
for through_obj in trade_offer.want_cards_available:
active_count = trade_offer.acceptances.filter(
offered_card=through_obj.card,
state__in=active_states
).count()
if active_count < through_obj.quantity:
available_offered_ids.append(through_obj.card.id)
self.fields["offered_card"].queryset = Card.objects.filter(id__in=available_offered_ids)
self.fields["offered_card"].queryset = trade_offer.want_cards_available_qs
def clean(self):
"""