summaryrefslogtreecommitdiff
path: root/Project-Unite
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-03-25 19:57:06 -0400
committerMichael <[email protected]>2017-03-25 19:57:06 -0400
commit416b9241755b3b1a6f1ba6fe4fb8b5f4b7ae360e (patch)
treea4c2b414138b7da011ae9fb1668996b1b9d9dfa0 /Project-Unite
parentbdfa66ec393bffcc744de37ee97715ff150bbb26 (diff)
downloadproject-unite-416b9241755b3b1a6f1ba6fe4fb8b5f4b7ae360e.tar.gz
project-unite-416b9241755b3b1a6f1ba6fe4fb8b5f4b7ae360e.tar.bz2
project-unite-416b9241755b3b1a6f1ba6fe4fb8b5f4b7ae360e.zip
f
Diffstat (limited to 'Project-Unite')
-rw-r--r--Project-Unite/Controllers/AdminController.cs12
1 files changed, 6 insertions, 6 deletions
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");
}