Merge branch 'main' of gitlab.com:PhilippHofer/rot
This commit is contained in:
commit
54a30473f4
@ -224,7 +224,6 @@ FROM user_trip WHERE trip_details_id = (SELECT trip_details_id FROM planned_even
|
|||||||
event.planned_starting_time.replace(':', "")
|
event.planned_starting_time.replace(':', "")
|
||||||
)));
|
)));
|
||||||
vevent.push(Summary::new(event.name));
|
vevent.push(Summary::new(event.name));
|
||||||
vevent.push(Duration::new("PT3H"));
|
|
||||||
calendar.add_event(vevent);
|
calendar.add_event(vevent);
|
||||||
}
|
}
|
||||||
let mut buf = Vec::new();
|
let mut buf = Vec::new();
|
||||||
|
@ -71,7 +71,7 @@ WHERE name like ?
|
|||||||
SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access
|
SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access
|
||||||
FROM user
|
FROM user
|
||||||
WHERE deleted = 0
|
WHERE deleted = 0
|
||||||
ORDER BY name
|
ORDER BY last_access DESC
|
||||||
"
|
"
|
||||||
)
|
)
|
||||||
.fetch_all(db)
|
.fetch_all(db)
|
||||||
|
Loading…
Reference in New Issue
Block a user