Compare commits

..

No commits in common. "4555391dd30b8c372da18252b9615ee506eae075" and "8aca437eb303acacc28a553a181a05d69bcbbcce" have entirely different histories.

View File

@ -179,8 +179,8 @@ impl From<LogbookUpdateError> for LogbookCreateError {
}
LogbookUpdateError::TooFast(km, min) => LogbookCreateError::TooFast(km, min),
LogbookUpdateError::AlreadyFinalized => LogbookCreateError::AlreadyFinalized,
LogbookUpdateError::ExternalSteeringPersonMustSteerOrShipmaster => {
LogbookCreateError::ExternalSteeringPersonMustSteerOrShipmaster
LogbookUpdateError::ExternalSteeringPersonMustSteer => {
LogbookCreateError::ExternalSteeringPersonMustSteer
}
}
}
@ -626,7 +626,6 @@ ORDER BY departure DESC
self.remove_rowers(db).await;
for rower in &log.rowers {
let user = User::find_by_id_tx(db, *rower as i32).await.unwrap();
if user.name == "Externe Steuerperson" {
if let (Some(steering_id), Some(shipmaster_id)) =
(log.steering_person, log.shipmaster)