Compare commits

..

No commits in common. "ae1091c9a2810f775c6154ad15316beca845699e" and "afc23ae519a872867c074c2269cbefcaa6bd06c1" have entirely different histories.

View File

@ -594,14 +594,8 @@ ORDER BY departure DESC
let today = Local::now().date_naive(); let today = Local::now().date_naive();
let day_diff = today - arr.date(); let day_diff = today - arr.date();
let day_diff = day_diff.num_days(); let day_diff = day_diff.num_days();
if day_diff >= 7 { if day_diff >= 7 && !user.has_role_tx(db, "admin").await {
if !user.has_role_tx(db, "admin").await return Err(LogbookUpdateError::OnlyAllowedToEndTripsEndingToday);
&& !user
.has_role_tx(db, "allow-retroactive-logbookentries")
.await
{
return Err(LogbookUpdateError::OnlyAllowedToEndTripsEndingToday);
}
} }
if day_diff < 0 && !user.has_role_tx(db, "admin").await { if day_diff < 0 && !user.has_role_tx(db, "admin").await {
return Err(LogbookUpdateError::OnlyAllowedToEndTripsEndingToday); return Err(LogbookUpdateError::OnlyAllowedToEndTripsEndingToday);