Skip to content

Commit 24d85ea

Browse files
committed
🐛 Fix Trip days order
1 parent 4b6d9a1 commit 24d85ea

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

backend/trip/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.17.0"
1+
__version__ = "1.17.1"

backend/trip/models/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ class Trip(TripBase, table=True):
260260
user: str = Field(foreign_key="user.username", ondelete="CASCADE")
261261

262262
places: list["Place"] = Relationship(back_populates="trips", link_model=TripPlaceLink)
263-
days: list["TripDay"] = Relationship(back_populates="trip", cascade_delete=True)
263+
days: list["TripDay"] = Relationship(back_populates="trip", sa_relationship_kwargs={"order_by": "TripDay.label"}, cascade_delete=True)
264264
shares: list["TripShare"] = Relationship(back_populates="trip", cascade_delete=True)
265265
packing_items: list["TripPackingListItem"] = Relationship(back_populates="trip", cascade_delete=True)
266266
checklist_items: list["TripChecklistItem"] = Relationship(back_populates="trip", cascade_delete=True)

src/src/app/components/trip/trip.component.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,10 +363,6 @@ export class TripComponent implements AfterViewInit {
363363
}, 100);
364364
}
365365

366-
sortTripDays() {
367-
this.trip?.days.sort((a, b) => a.label.localeCompare(b.label));
368-
}
369-
370366
toggleFiltering() {
371367
this.isFilteringMode = !this.isFilteringMode;
372368
if (!this.isFilteringMode) this.flattenTripDayItems();
@@ -412,7 +408,6 @@ export class TripComponent implements AfterViewInit {
412408
}
413409

414410
flattenTripDayItems(searchValue?: string) {
415-
this.sortTripDays();
416411
let prevLat: number, prevLng: number;
417412
this.flattenedTripItems = this.trip!.days.flatMap((day) =>
418413
[...day.items]

0 commit comments

Comments
 (0)