From 27127a6dc61afc2b0f35aa87dc6f84cadf31d751 Mon Sep 17 00:00:00 2001
From: Swiftkilla123 <165085079+Swiftkilla123@users.noreply.github.com>
Date: Sat, 20 Apr 2024 17:25:46 +0100
Subject: [PATCH 1/3] fix rw status indicator on personal target list
experimental, needs to be tested on staging first before deployment
---
target/views.py | 16 ++++++++++++----
templates/target/targets/line.html | 4 ++--
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/target/views.py b/target/views.py
index dfe234e9..02c26006 100644
--- a/target/views.py
+++ b/target/views.py
@@ -28,7 +28,7 @@
from django.shortcuts import redirect, render
from django.views.decorators.csrf import csrf_exempt
-from faction.models import Faction, FactionTarget
+from faction.models import Faction, FactionTarget, Member
from player.models import Key, Player
from target.functions import getTargets, updateAttacks, updateRevives
from yata.handy import apiCall, getFaction, getPlayer, returnError
@@ -230,12 +230,16 @@ def attack(request):
returnError(type=403, msg="Unknown request")
faction = getFaction(player.factionId)
- faction_targets = FactionTarget.objects.filter(target_id__in=faction.getTargetsId())
+ enemy_faction = Faction.objects.filter(tId=faction.warAgainst).first()
+ faction_targets = [] if not enemy_faction else (
+ Member.objects.filter(faction=enemy_faction).values_list('tId', flat=True)
+ )
+
context = {
"v": attack,
"targets": getTargets(player),
"ts": int(time.time()),
- "faction_targets": faction_targets.values_list("target_id", flat=True),
+ 'enemy_faction_targers': faction_targets,
}
return render(request, "target/attacks/button-target.html", context)
@@ -257,12 +261,16 @@ def targets(request):
# get faction
faction = Faction.objects.filter(tId=player.factionId).first()
factionTargets = [] if faction is None else faction.getTargetsId()
-
+ enemy_faction = Faction.objects.filter(tId=faction.warAgainst).first()
+ faction_targets = [] if not enemy_faction else (
+ Member.objects.filter(faction=enemy_faction).values_list('tId', flat=True)
+ )
context = {
"player": player,
"targetcat": True,
"targets": targets,
"factionTargets": factionTargets,
+ "faction_enemy_targets": faction_targets,
"ts": int(time.time()),
"view": {"targets": True},
}
diff --git a/templates/target/targets/line.html b/templates/target/targets/line.html
index 0cedd245..06f57690 100644
--- a/templates/target/targets/line.html
+++ b/templates/target/targets/line.html
@@ -69,8 +69,8 @@
{% include "target/targets/faction.html" %}
- |
- {% if targetId in faction_targets %}
+ |
+ {% if targetId in faction_enemy_targets %}
{% else %}
From 3308aa57d90248810144d117772d0a98ce3316b7 Mon Sep 17 00:00:00 2001
From: Swiftkilla123 <165085079+Swiftkilla123@users.noreply.github.com>
Date: Sat, 20 Apr 2024 17:27:26 +0100
Subject: [PATCH 2/3] fix typo
---
target/views.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/views.py b/target/views.py
index 02c26006..5302ac10 100644
--- a/target/views.py
+++ b/target/views.py
@@ -239,7 +239,7 @@ def attack(request):
"v": attack,
"targets": getTargets(player),
"ts": int(time.time()),
- 'enemy_faction_targers': faction_targets,
+ 'enemy_faction_targets': faction_targets,
}
return render(request, "target/attacks/button-target.html", context)
From e7abd6f2ad296ee6de9de2e35cbd457bb366445c Mon Sep 17 00:00:00 2001
From: Swiftkilla123 <165085079+Swiftkilla123@users.noreply.github.com>
Date: Sat, 20 Apr 2024 17:57:15 +0100
Subject: [PATCH 3/3] ensure consistent naming convention
---
target/views.py | 2 +-
templates/target/targets/line.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/views.py b/target/views.py
index 5302ac10..f92c2969 100644
--- a/target/views.py
+++ b/target/views.py
@@ -270,7 +270,7 @@ def targets(request):
"targetcat": True,
"targets": targets,
"factionTargets": factionTargets,
- "faction_enemy_targets": faction_targets,
+ "enemy_faction_targets": faction_targets,
"ts": int(time.time()),
"view": {"targets": True},
}
diff --git a/templates/target/targets/line.html b/templates/target/targets/line.html
index 06f57690..3461b768 100644
--- a/templates/target/targets/line.html
+++ b/templates/target/targets/line.html
@@ -70,7 +70,7 @@
{% include "target/targets/faction.html" %}
|
- {% if targetId in faction_enemy_targets %}
+ {% if targetId in enemy_faction_targets %}
{% else %}
|