From 739256b5421f132aa8c062499004bb650e20f950 Mon Sep 17 00:00:00 2001
From: Ethan-clay03 <ethanclay2017@gmail.com>
Date: Thu, 30 Jan 2025 21:26:54 +0000
Subject: [PATCH] Add True to ordering all_locations
---
app/admin/routes.py | 10 +++++-----
app/templates/admin/manage_bookings.html | 1 -
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/admin/routes.py b/app/admin/routes.py
index d9676e8..3ef6e8d 100644
--- a/app/admin/routes.py
+++ b/app/admin/routes.py
@@ -19,13 +19,13 @@ def home():
@bp.route('/manage_bookings')
@permission_required(admin_permission)
def manage_bookings():
- locations = Listings.get_all_locations()
+ locations = Listings.get_all_locations(True)
return render_template('admin/manage_bookings.html', locations=locations)
@bp.route('/manage_bookings/edit/<int:id>')
@permission_required(admin_permission)
def edit_booking(id):
- locations = Listings.get_all_locations()
+ locations = Listings.get_all_locations(True)
listing_information = Listings.search_listing(id)
time_options = generate_time_options()
@@ -95,7 +95,7 @@ def update_booking(id):
except Exception as e:
print(f"Error: {e}")
db.session.rollback()
- locations = Listings.get_all_locations()
+ locations = Listings.get_all_locations(True)
listing_information = Listings.search_listing(id)
return render_template(
'admin/edit_booking.html',
@@ -104,7 +104,7 @@ def update_booking(id):
error="An error occurred while updating the booking."
)
- locations = Listings.get_all_locations()
+ locations = Listings.get_all_locations(True)
flash('Successfully updated booking', 'success')
return redirect(url_for('admin.manage_bookings'))
@@ -210,7 +210,7 @@ def create_listing_post():
except Exception as e:
print(f"Error: {e}")
db.session.rollback()
- locations = Listings.get_all_locations()
+ locations = Listings.get_all_locations(True)
flash('An error occurred while creating the booking. Please try again', 'error')
return render_template('admin/create_listing.html', locations=locations)
diff --git a/app/templates/admin/manage_bookings.html b/app/templates/admin/manage_bookings.html
index 3fa3ab9..e3c686a 100644
--- a/app/templates/admin/manage_bookings.html
+++ b/app/templates/admin/manage_bookings.html
@@ -157,7 +157,6 @@
// Populate location options, TO UPDATE WITH LIVE LOCATIONS
const locations = JSON.parse('{{ locations|tojson|safe }}');
- locations.sort();
locations.forEach(location => {
$('#depart_location').append(new Option(location, location));
$('#destination_location').append(new Option(location, location));
--
GitLab