update-deps #717
@@ -594,9 +594,15 @@ ORDER BY departure DESC
 | 
			
		||||
        let today = Local::now().date_naive();
 | 
			
		||||
        let day_diff = today - arr.date();
 | 
			
		||||
        let day_diff = day_diff.num_days();
 | 
			
		||||
        if day_diff >= 7 && !user.has_role_tx(db, "admin").await {
 | 
			
		||||
        if day_diff >= 7 {
 | 
			
		||||
            if !user.has_role_tx(db, "admin").await
 | 
			
		||||
                && !user
 | 
			
		||||
                    .has_role_tx(db, "allow-retroactive-logbookentries")
 | 
			
		||||
                    .await
 | 
			
		||||
            {
 | 
			
		||||
                return Err(LogbookUpdateError::OnlyAllowedToEndTripsEndingToday);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        if day_diff < 0 && !user.has_role_tx(db, "admin").await {
 | 
			
		||||
            return Err(LogbookUpdateError::OnlyAllowedToEndTripsEndingToday);
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user