Skip to content

Commit a621087

Browse files
committed
Remove unnecessary code and refactor request handling
The changes clean up redundant code and simplify request parameter handling by directly using request.GET instead of a wrapper method.
1 parent 917f900 commit a621087

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

qfdmo/views/adresses.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,25 +105,23 @@ def get_sous_categorie_objet(self) -> str:
105105

106106
def get_sc_id(self, initial) -> str | None:
107107
return (
108-
self.get_data_from_request_or_bounded_form("sc_id")
109-
if initial["sous_categorie_objet"]
110-
else None
108+
self.request.GET.get("sc_id") if initial["sous_categorie_objet"] else None
111109
)
112110

113111
def get_sous_categories_ids(self) -> list[int]:
114112
return [self.get_data_from_request_or_bounded_form("sc_id", 0)]
115113

116114
def get_adresse(self) -> str:
117-
return self.get_data_from_request_or_bounded_form("adresse")
115+
return self.request.GET.get("adresse")
118116

119117
def get_longitude(self) -> str:
120-
return self.get_data_from_request_or_bounded_form("longitude")
118+
return self.request.GET.get("longitude")
121119

122120
def get_latitude(self) -> str:
123-
return self.get_data_from_request_or_bounded_form("latitude")
121+
return self.request.GET.get("latitude")
124122

125123
def get_digital(self) -> str:
126-
return self.get_data_from_request_or_bounded_form("digital", "0")
124+
return self.request.GET.get("digital", "0")
127125

128126
def get_data_from_request_or_bounded_form(self, key: str, default=None):
129127
"""Temporary dummy method
@@ -248,8 +246,6 @@ def get_context_data(self, **kwargs):
248246
kwargs.update(
249247
# TODO: refacto forms : define a BooleanField carte on CarteAddressesForm
250248
carte=self.is_carte,
251-
# TODO: refacto forms, return bounded form in template
252-
# form=form,
253249
location="{}",
254250
)
255251

qfdmo/views/carte.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ class CarteSearchActeursView(SearchActeursView):
1616
template_name = "qfdmo/carte.html"
1717
form_class = CarteForm
1818

19-
def __init__(self, *args, **kwargs):
20-
super().__init__(*args, **kwargs)
21-
2219
def get_initial(self, *args, **kwargs):
2320
initial = super().get_initial(*args, **kwargs)
2421
action_displayed = self._set_action_displayed()
@@ -37,6 +34,7 @@ def get_initial(self, *args, **kwargs):
3734

3835
def get_context_data(self, **kwargs):
3936
self.displayed_acteur_form = DisplayedActeursForm(self.request.GET)
37+
4038
if not self.displayed_acteur_form.is_valid():
4139
logger.error(f"Form is valid {self.displayed_acteur_form=}")
4240

@@ -58,7 +56,7 @@ def get_sous_categories(self):
5856
):
5957
return sous_categories.values_list("pk", flat=True)
6058

61-
return []
59+
# return super().get_sous_categories()
6260

6361

6462
class ProductCarteView(CarteSearchActeursView):
@@ -78,11 +76,6 @@ class CustomCarteView(DetailView, CarteSearchActeursView):
7876
model = CarteConfig
7977
context_object_name = "carte_config"
8078

81-
def get_context_data(self, *args, **kwargs):
82-
ctx = super().get_context_data(*args, **kwargs)
83-
84-
return ctx
85-
8679
@cached_property
8780
def groupe_actions(self):
8881
# TODO: cache

0 commit comments

Comments
 (0)