1.7.0 password recovery
This commit is contained in:
@@ -5,15 +5,25 @@ from django.contrib import admin
|
||||
class Admin_Route(Admin_Trans_BaseModel):
|
||||
readonly_fields = ['highlight_end_DT', 'rising_DT']
|
||||
list_display = [
|
||||
'id', 'owner_type', 'receive_msg_by_email', 'type_transport', 'cargo_type',
|
||||
'id', 'owner_type',
|
||||
'rising_DT',
|
||||
'receive_msg_by_email', 'type_transport', 'cargo_type',
|
||||
'departure_DT', 'from_city', 'from_place',
|
||||
'arrival_DT', 'to_city', 'to_place', 'owner',
|
||||
'order', 'modifiedDT', 'createDT'
|
||||
]
|
||||
list_editable = ['rising_DT']
|
||||
|
||||
list_display_links = ['id']
|
||||
|
||||
list_filter = ['owner_type', 'type_transport', 'cargo_type', 'from_place', 'arrival_DT', 'modifiedDT', 'createDT']
|
||||
list_filter = [
|
||||
'owner_type', 'type_transport',
|
||||
'rising_DT',
|
||||
'cargo_type',
|
||||
'from_place', 'arrival_DT',
|
||||
'modifiedDT', 'createDT'
|
||||
]
|
||||
|
||||
search_fields = [
|
||||
'owner__first_name', 'owner__last_name', 'from_city__name', 'to_city__name'
|
||||
]
|
||||
|
||||
@@ -2,8 +2,8 @@ from .models import *
|
||||
from .forms import *
|
||||
from django.utils.translation import gettext as _
|
||||
from django.template.loader import render_to_string
|
||||
from datetime import datetime
|
||||
from django.db.models import F
|
||||
from datetime import datetime, timedelta
|
||||
from django.db.models import F, Q
|
||||
|
||||
elements_on_page = 25
|
||||
|
||||
@@ -258,6 +258,12 @@ def get_routes_Dict(user=None, data=None):
|
||||
# rising_DT=None
|
||||
# )
|
||||
|
||||
routes_rising_off = Route.objects.exclude(rising_DT=None).filter(
|
||||
Q(rising_DT__lt=datetime.now() - timedelta(days=1)) | Q(departure_DT__lt=datetime.now())
|
||||
)
|
||||
if routes_rising_off:
|
||||
routes_rising_off.update(rising_DT=None)
|
||||
|
||||
routes = Route.objects.filter(
|
||||
**kwargs
|
||||
).order_by(
|
||||
|
||||
Reference in New Issue
Block a user