dani/django-ram
1
0
Fork 0
mirror of https://github.com/daniviga/django-ram.git synced 2025-08-04 13:17:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a dependency on solo during bootstrap

Browse Source
This commit is contained in:
Daniele Viganò
2023-10-06 21:37:24 +02:00
parent 4b0361acc1
commit a21baac10c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ram/portal/views.py
View File

@@ -5,6 +5,7 @@ from urllib.parse import unquote
from django.views import View from django.views import View
from django.http import Http404, HttpResponseBadRequest from django.http import Http404, HttpResponseBadRequest
from django.db.utils import OperationalError, ProgrammingError
from django.db.models import Q from django.db.models import Q
from django.shortcuts import render, get_object_or_404 from django.shortcuts import render, get_object_or_404
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
@@ -19,7 +20,11 @@ from metadata.models import Company, Manufacturer, Scale, RollingStockType, Tag
def order_by_fields(): def order_by_fields():
order_by = get_site_conf().items_ordering try:
order_by = get_site_conf().items_ordering
except (OperationalError, ProgrammingError):
order_by = "type"
fields = [ fields = [
"rolling_class__type", "rolling_class__type",
"rolling_class__company", "rolling_class__company",

2
ram/ram/__init__.py
View File

@@ -1,4 +1,4 @@
from ram.utils import git_suffix from ram.utils import git_suffix
__version__ = "0.6.1" __version__ = "0.6.2"
__version__ += git_suffix(__file__) __version__ += git_suffix(__file__)