diff --git a/Website/LOC.Website.Common/Contexts/LOCContext.cs b/Website/LOC.Website.Common/Contexts/LOCContext.cs index 7a86f09b9..ff2fb2b9c 100644 --- a/Website/LOC.Website.Common/Contexts/LOCContext.cs +++ b/Website/LOC.Website.Common/Contexts/LOCContext.cs @@ -32,7 +32,6 @@ namespace LOC.Website.Common.Contexts public DbSet Items { get; set; } public DbSet Pets { get; set; } public DbSet PetExtras { get; set; } - public DbSet LogEntries { get; set; } public DbSet Servers { get; set; } public DbSet ServerHistory { get; set; } public DbSet ServerStatuses { get; set; } diff --git a/Website/LOC.Website.Common/Contexts/LOCContextConfiguration.cs b/Website/LOC.Website.Common/Contexts/LOCContextConfiguration.cs index bc30930ed..91ff5a8ca 100644 --- a/Website/LOC.Website.Common/Contexts/LOCContextConfiguration.cs +++ b/Website/LOC.Website.Common/Contexts/LOCContextConfiguration.cs @@ -75,8 +75,8 @@ private void AddDefaultLogEntry(LocContext context) { - context.LogEntries.Add(new LogEntry {Date = DateTime.Now, Category = "Log", Message = "test"}); - context.SaveChanges(); + //context.LogEntries.Add(new LogEntry {Date = DateTime.Now, Category = "Log", Message = "test"}); + //context.SaveChanges(); } } } diff --git a/Website/LOC.Website.Web/Areas/Manage/Controllers/LogController.cs b/Website/LOC.Website.Web/Areas/Manage/Controllers/LogController.cs index 9fc742f54..61cd5db19 100644 --- a/Website/LOC.Website.Web/Areas/Manage/Controllers/LogController.cs +++ b/Website/LOC.Website.Web/Areas/Manage/Controllers/LogController.cs @@ -14,7 +14,7 @@ namespace LOC.Website.Web.Areas.Manage.Controllers public ViewResult Index() { - return View(context.LogEntries.ToList()); + return View(/*context.LogEntries.ToList()*/); } // @@ -22,8 +22,8 @@ namespace LOC.Website.Web.Areas.Manage.Controllers public ViewResult Details(int id) { - LogEntry logentry = context.LogEntries.Single(x => x.LogEntryId == id); - return View(logentry); + //LogEntry logentry = context.LogEntries.Single(x => x.LogEntryId == id); + return View(/*logentry*/); } // @@ -31,8 +31,8 @@ namespace LOC.Website.Web.Areas.Manage.Controllers public ActionResult Delete(int id) { - LogEntry logentry = context.LogEntries.Single(x => x.LogEntryId == id); - return View(logentry); + //LogEntry logentry = context.LogEntries.Single(x => x.LogEntryId == id); + return View(); } // @@ -41,8 +41,8 @@ namespace LOC.Website.Web.Areas.Manage.Controllers [HttpPost, ActionName("Delete")] public ActionResult DeleteConfirmed(int id) { - LogEntry logentry = context.LogEntries.Single(x => x.LogEntryId == id); - context.LogEntries.Remove(logentry); + //LogEntry logentry = context.LogEntries.Single(x => x.LogEntryId == id); + //context.LogEntries.Remove(logentry); context.SaveChanges(); return RedirectToAction("Index"); } diff --git a/Website/LOC.Website.Web/Controllers/PlayerAccountController.cs b/Website/LOC.Website.Web/Controllers/PlayerAccountController.cs index ac7060d12..4c9b5f16b 100644 --- a/Website/LOC.Website.Web/Controllers/PlayerAccountController.cs +++ b/Website/LOC.Website.Web/Controllers/PlayerAccountController.cs @@ -50,9 +50,7 @@ [HttpPost] public ActionResult Login(LoginRequestToken loginRequest) { - long time = Environment.TickCount; var json = JsonConvert.SerializeObject(new ClientToken(_accountAdministrator.Login(loginRequest))); - _logger.Log("Login Debug", "Total Login : " + (Environment.TickCount - time) + "ms"); return Content(json, "application/json"); } diff --git a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml index 2d2c892c7..60208414b 100644 --- a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml +++ b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml @@ -7,7 +7,6 @@ - @@ -18,7 +17,7 @@ - + @@ -27,8 +26,8 @@ - + @@ -64,6 +63,7 @@ + @@ -78,7 +78,9 @@ + + @@ -88,17 +90,15 @@ - - - + @@ -107,18 +107,17 @@ - - + + - + - @@ -128,21 +127,21 @@ - - + + - + - + @@ -153,10 +152,11 @@ - + + - + @@ -176,11 +176,10 @@ - - + + - @@ -212,25 +211,26 @@ - + - - - + + + - + + @@ -239,9 +239,9 @@ - + - + @@ -267,46 +267,47 @@ + - + - + - - + + - - - - + + + - + + - + - - + + - + - + - + - + @@ -316,23 +317,24 @@ - - + + + + - - - + + + - + - + + - - @@ -341,35 +343,36 @@ + - - + - + - - - + + + + - + - + - + @@ -377,123 +380,120 @@ - - - + + + + + - + - - - + + + + + - + - - + + - - + + - - - + - - - - + + + + - - + - + - - - - - - + + - - + - + - + - + - - - - - - - - + + + + + + + + - - + + - + - - - + + + - + + @@ -501,13 +501,13 @@ - + - + - + - +