Merge pull request 'push' (#658) from fix into main
Reviewed-on: #658
This commit was merged in pull request #658.
	This commit is contained in:
		| @@ -179,8 +179,8 @@ impl From<LogbookUpdateError> for LogbookCreateError { | ||||
|             } | ||||
|             LogbookUpdateError::TooFast(km, min) => LogbookCreateError::TooFast(km, min), | ||||
|             LogbookUpdateError::AlreadyFinalized => LogbookCreateError::AlreadyFinalized, | ||||
|             LogbookUpdateError::ExternalSteeringPersonMustSteer => { | ||||
|                 LogbookCreateError::ExternalSteeringPersonMustSteer | ||||
|             LogbookUpdateError::ExternalSteeringPersonMustSteerOrShipmaster => { | ||||
|                 LogbookCreateError::ExternalSteeringPersonMustSteerOrShipmaster | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| @@ -626,6 +626,7 @@ 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) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user