Compare commits
No commits in common. "db318c23cdd9314be616f90ef5c542895c9e574b" and "a682d1e6ce8d08f4a12337d7997912730aa810a6" have entirely different histories.
db318c23cd
...
a682d1e6ce
@ -179,8 +179,8 @@ impl From<LogbookUpdateError> for LogbookCreateError {
|
|||||||
}
|
}
|
||||||
LogbookUpdateError::TooFast(km, min) => LogbookCreateError::TooFast(km, min),
|
LogbookUpdateError::TooFast(km, min) => LogbookCreateError::TooFast(km, min),
|
||||||
LogbookUpdateError::AlreadyFinalized => LogbookCreateError::AlreadyFinalized,
|
LogbookUpdateError::AlreadyFinalized => LogbookCreateError::AlreadyFinalized,
|
||||||
LogbookUpdateError::ExternalSteeringPersonMustSteerOrShipmaster => {
|
LogbookUpdateError::ExternalSteeringPersonMustSteer => {
|
||||||
LogbookCreateError::ExternalSteeringPersonMustSteerOrShipmaster
|
LogbookCreateError::ExternalSteeringPersonMustSteer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -626,7 +626,6 @@ ORDER BY departure DESC
|
|||||||
|
|
||||||
self.remove_rowers(db).await;
|
self.remove_rowers(db).await;
|
||||||
for rower in &log.rowers {
|
for rower in &log.rowers {
|
||||||
let user = User::find_by_id_tx(db, *rower as i32).await.unwrap();
|
|
||||||
if user.name == "Externe Steuerperson" {
|
if user.name == "Externe Steuerperson" {
|
||||||
if let (Some(steering_id), Some(shipmaster_id)) =
|
if let (Some(steering_id), Some(shipmaster_id)) =
|
||||||
(log.steering_person, log.shipmaster)
|
(log.steering_person, log.shipmaster)
|
||||||
|
Loading…
Reference in New Issue
Block a user