diff --git a/src/Tgstation.Server.Host/Components/StaticFiles/IConfiguration.cs b/src/Tgstation.Server.Host/Components/StaticFiles/IConfiguration.cs
index 29b8b66da0..7c6ec4298b 100644
--- a/src/Tgstation.Server.Host/Components/StaticFiles/IConfiguration.cs
+++ b/src/Tgstation.Server.Host/Components/StaticFiles/IConfiguration.cs
@@ -74,7 +74,7 @@ namespace Tgstation.Server.Host.Components.StaticFiles
/// The data to write. If , the file is deleted
/// The hash any existing file must match in order for the write to succeed
/// The for the operation. Usage may result in partial writes
- /// A resulting in the updated
+ /// A resulting in the updated or if the write failed due to conflicts
Task Write(string configurationRelativePath, ISystemIdentity systemIdentity, byte[] data, string previousHash, CancellationToken cancellationToken);
}
}
\ No newline at end of file
diff --git a/src/Tgstation.Server.Host/Controllers/ConfigurationController.cs b/src/Tgstation.Server.Host/Controllers/ConfigurationController.cs
index acaf5206dd..327f289072 100644
--- a/src/Tgstation.Server.Host/Controllers/ConfigurationController.cs
+++ b/src/Tgstation.Server.Host/Controllers/ConfigurationController.cs
@@ -68,7 +68,7 @@ namespace Tgstation.Server.Host.Controllers
if (newFile == null)
return Conflict(new ErrorMessage
{
- Message = ""
+ Message = "This file has been updated since you last viewed it!"
});
newFile.Content = null;
@@ -171,6 +171,7 @@ namespace Tgstation.Server.Host.Controllers
try
{
+ model.IsDirectory = true;
return await instanceManager.GetInstance(Instance).Configuration.CreateDirectory(model.Path, AuthenticationContext.SystemIdentity, cancellationToken).ConfigureAwait(false) ? (IActionResult)Json(model) : StatusCode((int)HttpStatusCode.Created, model);
}
catch (NotImplementedException)