Skip to content

Commit b169313

Browse files
committed
remove migration code
1 parent b140803 commit b169313

File tree

3 files changed

+7
-107
lines changed

3 files changed

+7
-107
lines changed

bullet/bullet_admin/templates/bullet_admin/generic/list.html

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,6 @@
2121
{% for link in list_links %}
2222
{% #abtn icon=link.icon label=link.label color=link.color url=link.url|add:back %}
2323
{% endfor %}
24-
25-
{# TODO: Remove #}
26-
{% if help_url %}
27-
{% #abtn icon="mdi:help" label="Help" url=help_url|add:back %}
28-
{% endif %}
29-
{% if new_folder_url %}
30-
{% #abtn icon="mdi:folder-plus" label="New folder" url=new_folder_url|add:back %}
31-
{% endif %}
32-
{% if assign_numbers_url %}
33-
{% #abtn icon="mdi:numeric" label="Assign numbers" url=assign_numbers_url|add:back %}
34-
{% endif %}
35-
{% if export_url %}
36-
{% #abtn color="blue" icon="mdi:export" label="Export" url=export_url|add:back %}
37-
{% endif %}
38-
{% if create_url %}
39-
{% if object_name %}
40-
{% #abtn color="green" icon="mdi:plus" label="New "|add:object_name url=create_url|add:back %}
41-
{% else %}
42-
{% #abtn color="green" icon="mdi:plus" label="New" url=create_url|add:back %}
43-
{% endif %}
44-
{% endif %}
45-
{% if upload_url %}
46-
{% #abtn color="green" icon="mdi:upload" label="Upload File" url=upload_url|add:back %}
47-
{% endif %}
4824
{% endslot %}
4925

5026
{{ list_subtitle }}

bullet/bullet_admin/views/content.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -401,11 +401,11 @@ def get_language_content(self, object):
401401
lang = get_language_info(object.language)
402402
return lang["name"]
403403

404-
def get_edit_url(self, menu: Menu) -> str:
405-
return reverse("badmin:menu_edit", args=[menu.pk])
406-
407-
def get_delete_url(self, menu: Menu) -> str:
408-
return reverse("badmin:menu_delete", args=[menu.pk])
404+
def get_row_links(self, object) -> list[Link]:
405+
return [
406+
EditIcon(reverse("badmin:menu_edit", args=[object.pk])),
407+
DeleteIcon(reverse("badmin:menu_delete", args=[object.pk])),
408+
]
409409

410410

411411
class MenuItemEditView(TranslatorRequiredMixin, UpdateView):

bullet/bullet_admin/views/generic/list.py

Lines changed: 2 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import warnings
21
from functools import reduce
32
from operator import attrgetter, or_
43
from typing import Any, Callable
@@ -10,7 +9,7 @@
109

1110
from bullet_admin.mixins import MixinProtocol
1211
from bullet_admin.utils import get_allowed_countries
13-
from bullet_admin.views.generic.links import DeleteIcon, EditIcon, Link, ViewIcon
12+
from bullet_admin.views.generic.links import Link
1413

1514

1615
class ModelFiltering(MixinProtocol):
@@ -167,9 +166,6 @@ class GenericList(CountryNavigation, LanguageNavigation, OrderedSearch, MixinPro
167166
table_labels: dict[str, str] = {}
168167
table_field_templates: dict[str, str] = {}
169168

170-
# deprecated
171-
object_name = None
172-
173169
def get_context_data(self, *, object_list=None, **kwargs):
174170
ctx = {}
175171
qs = self.get_queryset()
@@ -184,23 +180,6 @@ def get_context_data(self, *, object_list=None, **kwargs):
184180

185181
ctx.update(super().get_context_data(object_list=qs, **kwargs))
186182

187-
ctx["object_name"] = self.get_object_name()
188-
189-
OLD_NAMES = [
190-
"help_url",
191-
"create_url",
192-
"upload_url",
193-
"export_url",
194-
"new_folder_url",
195-
"assign_numbers_url",
196-
]
197-
for name in OLD_NAMES:
198-
val = getattr(self, name, None)
199-
ctx[name] = val
200-
if val:
201-
warnings.warn(f"{name} is deprecated in {self.__class__.__name__}.")
202-
203-
# NEW
204183
ctx["list_title"] = self.get_list_title()
205184
ctx["list_subtitle"] = self.get_list_subtitle()
206185
ctx["list_links"] = self.get_list_links()
@@ -223,38 +202,12 @@ def get_list_links(self) -> list[Link]:
223202
return self.list_links
224203

225204
def get_list_subtitle(self) -> str | None:
226-
# TODO: Remove
227-
if hasattr(self, "subtitle"):
228-
warnings.warn(f"subtitle is deprecated in {self.__class__.__name__}")
229-
return self.subtitle
230205
return self.list_subtitle
231206

232207
def get_table_fields(self) -> list[str]:
233-
# TODO: Remove
234-
if hasattr(self, "get_fields"):
235-
warnings.warn(f"get_fields is deprecated in {self.__class__.__name__}")
236-
return self.get_fields()
237-
if hasattr(self, "fields"):
238-
warnings.warn(f"fields is deprecated in {self.__class__.__name__}")
239-
return self.fields
240208
return self.table_fields
241209

242-
def get_object_name(self):
243-
return (
244-
self.object_name
245-
if self.object_name
246-
else self.get_list_title().split(" ")[-1].lower()[0:-1]
247-
)
248-
249210
def get_table_labels(self) -> list[tuple[str, str]]:
250-
# TODO: Remove
251-
if hasattr(self, "get_labels"):
252-
warnings.warn(f"get_labels is deprecated in {self.__class__.__name__}")
253-
return self.get_labels()
254-
if hasattr(self, "labels"):
255-
warnings.warn(f"labels is deprecated in {self.__class__.__name__}")
256-
self.table_labels = self.labels
257-
258211
labels = []
259212
for field in self.get_table_fields():
260213
label = field.replace("_", " ").capitalize()
@@ -265,35 +218,10 @@ def get_table_labels(self) -> list[tuple[str, str]]:
265218

266219
return labels
267220

268-
def _migrate_old_links(self, object):
269-
# TODO: Remove
270-
links = []
271-
MAPPING = {
272-
"get_edit_url": EditIcon,
273-
"get_view_url": ViewIcon,
274-
"get_delete_url": DeleteIcon,
275-
"get_download_url": None,
276-
"get_generate": None,
277-
}
278-
279-
for func, icon in MAPPING.items():
280-
if hasattr(self, func):
281-
warnings.warn(f"{func} is deprecated in {self.__class__.__name__}")
282-
if not icon:
283-
continue
284-
url = getattr(self, func)(object)
285-
links.append(icon(url))
286-
287-
return links
288-
289221
def get_row_links(self, object) -> list[Link]:
290-
return self._migrate_old_links(object)
222+
return []
291223

292224
def get_row_fields(self, object) -> list[str]:
293-
if hasattr(self, "field_templates"):
294-
warnings.warn(f"field_templates is deprecated in {self.__class__.__name__}")
295-
self.table_field_templates = self.field_templates
296-
297225
fields = []
298226
for field in self.get_table_fields():
299227
data = getattr(object, field, None)
@@ -313,10 +241,6 @@ def get_row_fields(self, object) -> list[str]:
313241
return fields
314242

315243
def get_row_context(self, object):
316-
# TODO: Remove
317-
if hasattr(self, "create_row"):
318-
warnings.warn(f"create_row is deprecated in {self.__class__.__name__}")
319-
320244
return {
321245
"fields": self.get_row_fields(object),
322246
"links": self.get_row_links(object),

0 commit comments

Comments
 (0)