diff --git a/Project-Unite/Controllers/AdminController.cs b/Project-Unite/Controllers/AdminController.cs index ad8261c..e1bd26c 100644 --- a/Project-Unite/Controllers/AdminController.cs +++ b/Project-Unite/Controllers/AdminController.cs @@ -110,7 +110,7 @@ Unlike previous ShiftOS site revamps, your account got migrated over. However, t return RedirectToAction("Users"); } - public ActionResult BackupDatabase() + public ActionResult BackupAssets() { var db = new ApplicationDbContext(); string backupDir = "~/Backups/Database"; @@ -123,17 +123,17 @@ Unlike previous ShiftOS site revamps, your account got migrated over. However, t System.IO.Compression.ZipFile.CreateFromDirectory(Server.MapPath("~/Uploads"), backupname); - var backupData = new DatabaseBackup(); + var backupData = new AssetBackup(); backupData.Id = Guid.NewGuid().ToString(); backupData.UserId = User.Identity.GetUserId(); backupData.DownloadUrl = backupUrl; backupData.Timestamp = DateTime.Now; - db.Backups.Add(backupData); + db.AssetBackups.Add(backupData); db.SaveChanges(); return RedirectToAction("Backups"); } - public ActionResult BackupAssets() + public ActionResult BackupDatabase() { var db = new ApplicationDbContext(); string backupDir = "~/Backups/Assets"; @@ -145,12 +145,12 @@ Unlike previous ShiftOS site revamps, your account got migrated over. However, t string backupname = backupServerDir + "\\ShiftOS-" + DateTime.Now.ToString() + ".sql"; const string sqlCommand = @"BACKUP DATABASE [{0}] TO DISK = N'{1}' WITH NOFORMAT, NOINIT, NAME = N'ShiftOS Database Backup', SKIP, NOREWIND, NOUNLOAD, STATS = 10"; int path = db.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, string.Format(sqlCommand, db.Database.Connection.Database, backupname)); - var backupData = new AssetBackup(); + var backupData = new DatabaseBackup(); backupData.Id = Guid.NewGuid().ToString(); backupData.UserId = User.Identity.GetUserId(); backupData.DownloadUrl = backupUrl; backupData.Timestamp = DateTime.Now; - db.AssetBackups.Add(backupData); + db.Backups.Add(backupData); db.SaveChanges(); return RedirectToAction("Backups"); }