Skip to content

Commit 75c530d

Browse files
committed
Update
1 parent 2abe937 commit 75c530d

File tree

10 files changed

+20
-19
lines changed

10 files changed

+20
-19
lines changed

Controllers/CronsController.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System.Linq;
22
using System.Web.Mvc;
3+
using Alexr03.Common.TCAdmin.Web.Binders;
34
using Alexr03.Common.Web.Helpers;
45
using Newtonsoft.Json.Linq;
5-
using TCAdmin.SDK.Objects;
66
using TCAdmin.SDK.VirtualFileSystem;
77
using TCAdmin.SDK.Web.FileManager;
88
using TCAdmin.SDK.Web.MVC.Controllers;
@@ -17,14 +17,13 @@ public ActionResult Configuration()
1717
{
1818
return View();
1919
}
20-
20+
2121
[ParentAction("Configuration")]
22-
public ActionResult ConfigureCron(int id)
22+
public ActionResult ConfigureCron([DynamicTypeBaseBinder] CronJob cronJob)
2323
{
24-
var cronJob = new CronJob(id);
25-
TempData["id"] = id;
24+
TempData["id"] = cronJob.Id;
2625
TempData["repeatEvery"] = cronJob.ExecuteEverySeconds;
27-
var configurationJObject = (JObject)cronJob.Configuration.Parse<object>();
26+
var configurationJObject = cronJob.Configuration.Parse<JObject>();
2827
var o = configurationJObject.ToObject(cronJob.Configuration.Type);
2928
ViewData.TemplateInfo = new TemplateInfo
3029
{
@@ -35,12 +34,11 @@ public ActionResult ConfigureCron(int id)
3534

3635
[HttpPost]
3736
[ParentAction("Configuration")]
38-
public ActionResult ConfigureCron(int id, FormCollection model)
37+
public ActionResult ConfigureCron([DynamicTypeBaseBinder] CronJob cronJob, FormCollection model)
3938
{
40-
var cronJob = new CronJob(id);
4139
cronJob.ExecuteEverySeconds = int.Parse(Request[$"{cronJob.Configuration.Type.Name}.repeatEvery"]);
4240
cronJob.Save();
43-
TempData["id"] = id;
41+
TempData["id"] = cronJob.Id;
4442
TempData["repeatEvery"] = cronJob.ExecuteEverySeconds;
4543
var bindModel = model.Parse(ControllerContext, cronJob.Configuration.Type);
4644
cronJob.Configuration.SetConfiguration(bindModel);

Crons/GameUpdates/MinecraftBukkitUpdatesCron.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class MinecraftBukkitUpdatesCron : TcAdminCronJob
1515
{
1616
private BukkitSettings _bukkitSettings;
1717

18-
public MinecraftBukkitUpdatesCron() : base(Logger.Create<MinecraftBukkitUpdatesCron>())
18+
public MinecraftBukkitUpdatesCron() : base()
1919
{
2020
}
2121

Crons/GameUpdates/MinecraftPaperUpdatesCron.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class MinecraftPaperUpdatesCron : TcAdminCronJob
1313
{
1414
private PaperSettings _paperSettings;
1515

16-
public MinecraftPaperUpdatesCron() : base(Logger.Create<MinecraftPaperUpdatesCron>())
16+
public MinecraftPaperUpdatesCron() : base()
1717
{
1818
}
1919

Crons/GameUpdates/MinecraftSpigotUpdatesCron.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class MinecraftSpigotUpdatesCron : TcAdminCronJob
1111
{
1212
private SpigotSettings _spigotSettings;
1313

14-
public MinecraftSpigotUpdatesCron() : base(Alexr03.Common.Logging.Logger.Create<MinecraftSpigotUpdatesCron>())
14+
public MinecraftSpigotUpdatesCron() : base()
1515
{
1616
}
1717

Crons/GameUpdates/MinecraftVanillaSnapshotUpdatesCron.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class MinecraftVanillaSnapshotUpdatesCron : TcAdminCronJob
1111
{
1212
private VanillaSnapshotSettings _vanillaSnapshotSettings;
1313

14-
public MinecraftVanillaSnapshotUpdatesCron() : base(Alexr03.Common.Logging.Logger.Create<MinecraftVanillaSnapshotUpdatesCron>())
14+
public MinecraftVanillaSnapshotUpdatesCron() : base()
1515
{
1616
}
1717

Crons/GameUpdates/MinecraftVanillaUpdatesCron.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class MinecraftVanillaUpdatesCron : TcAdminCronJob
1515
{
1616
private VanillaSettings _vanillaSettings;
1717

18-
public MinecraftVanillaUpdatesCron() : base(Alexr03.Common.Logging.Logger.Create<MinecraftVanillaUpdatesCron>())
18+
public MinecraftVanillaUpdatesCron() : base()
1919
{
2020
}
2121

Globals.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
public static class Globals
44
{
55
public const string ModuleId = "3a0e1e17-cbee-4e00-871e-e3f492e8c8da";
6+
public const string TableName = "tcmodule_cron_jobs";
67
}
78
}

Models/Objects/CronJob.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
using System.Linq;
33
using Alexr03.Common.TCAdmin.Objects;
44
using TCAdmin.Interfaces.Database;
5+
using TCAdmin.SDK.Objects;
6+
using TCAdmin.SDK.Web.MVC.Controllers;
57

68
namespace TCAdminCrons.Models.Objects
79
{
@@ -11,7 +13,7 @@ public CronJob() : base("tcmodule_cron_jobs")
1113
{
1214
this.SetValue("id", -1);
1315
}
14-
16+
1517
public CronJob(int id) : this()
1618
{
1719
this.SetValue("id", id);

TcAdminCronJob.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ namespace TCAdminCrons
55
{
66
public abstract class TcAdminCronJob : IJob
77
{
8-
protected TcAdminCronJob(Logger logger)
8+
protected TcAdminCronJob()
99
{
10-
Logger = logger;
10+
Logger = Logger.Create(GetType());
1111
}
1212

13-
public Logger Logger { get; private set; }
13+
public Logger Logger { get; }
1414

1515
public abstract System.Threading.Tasks.Task DoAction();
1616

Views/TCAdminCrons.Controllers/Crons/Configuration.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
.Name("tabstrip")
1616
.Items(items =>
1717
{
18-
foreach (var cronJob in CronJob.GetCronJobs().Where(cron => cron.Configuration.HasView()))
18+
foreach (var cronJob in CronJob.GetCronJobs().Where(cron => cron.HasConfiguration && cron.Configuration.HasView()))
1919
{
2020
items.Add().Text(cronJob.Create().GetType().Name.SplitEveryCapital()).LoadContentFrom("ConfigureCron", "Crons", new {id = cronJob.Id});
2121
}

0 commit comments

Comments
 (0)