summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-03-25 19:51:30 -0400
committerMichael <[email protected]>2017-03-25 19:51:30 -0400
commit428579cf6b3bc67ec7a3e3f6d97e03bdd42031c6 (patch)
tree6a2fdadcf2ad5f8c39151ba34405a3d11e824bbd
parent7a4d0e4bb12ec6b73f0147603fc58126a81e258c (diff)
downloadproject-unite-428579cf6b3bc67ec7a3e3f6d97e03bdd42031c6.tar.gz
project-unite-428579cf6b3bc67ec7a3e3f6d97e03bdd42031c6.tar.bz2
project-unite-428579cf6b3bc67ec7a3e3f6d97e03bdd42031c6.zip
fookyoo TV fookmi TV
-rw-r--r--Project-Unite/Controllers/AdminController.cs2
-rw-r--r--Project-Unite/Models/IdentityModels.cs10
-rw-r--r--Project-Unite/Models/ManageViewModels.cs2
3 files changed, 11 insertions, 3 deletions
diff --git a/Project-Unite/Controllers/AdminController.cs b/Project-Unite/Controllers/AdminController.cs
index 8b424ad..f5b3041 100644
--- a/Project-Unite/Controllers/AdminController.cs
+++ b/Project-Unite/Controllers/AdminController.cs
@@ -145,7 +145,7 @@ 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 DatabaseBackup();
+ var backupData = new AssetBackup();
backupData.Id = Guid.NewGuid().ToString();
backupData.UserId = User.Identity.GetUserId();
backupData.DownloadUrl = backupUrl;
diff --git a/Project-Unite/Models/IdentityModels.cs b/Project-Unite/Models/IdentityModels.cs
index ced6fc3..32d3d76 100644
--- a/Project-Unite/Models/IdentityModels.cs
+++ b/Project-Unite/Models/IdentityModels.cs
@@ -205,7 +205,7 @@ namespace Project_Unite.Models
}
public DbSet<DatabaseBackup> Backups { get; set; }
- public DbSet<DatabaseBackup> AssetBackups { get; set; }
+ public DbSet<AssetBackup> AssetBackups { get; set; }
public DbSet<Avatar> UserAvatars { get; set; }
public DbSet<Skin> Skins { get; set; }
public DbSet<Configuration> Configs { get; set; }
@@ -288,4 +288,12 @@ namespace Project_Unite.Models
public string UserId { get; set; }
public string DownloadUrl { get; set; }
}
+
+ public class AssetBackup
+ {
+ public string Id { get; set; }
+ public DateTime Timestamp { get; set; }
+ public string UserId { get; set; }
+ public string DownloadUrl { get; set; }
+ }
} \ No newline at end of file
diff --git a/Project-Unite/Models/ManageViewModels.cs b/Project-Unite/Models/ManageViewModels.cs
index d8a1497..dc201c8 100644
--- a/Project-Unite/Models/ManageViewModels.cs
+++ b/Project-Unite/Models/ManageViewModels.cs
@@ -17,7 +17,7 @@ namespace Project_Unite.Models
public class BackupViewModel
{
public IEnumerable<DatabaseBackup> Databases { get; set; }
- public IEnumerable<DatabaseBackup> AssetFolders { get; set; }
+ public IEnumerable<AssetBackup> AssetFolders { get; set; }
}
public class ManageLoginsViewModel