diff --git a/src/Hangfire.Core/Dashboard/Content/css/hangfire.css b/src/Hangfire.Core/Dashboard/Content/css/hangfire.css index 6cceb6452..f88c7762a 100644 --- a/src/Hangfire.Core/Dashboard/Content/css/hangfire.css +++ b/src/Hangfire.Core/Dashboard/Content/css/hangfire.css @@ -537,6 +537,24 @@ div.metric-null { display: none; } +.ellipsis { + width: 220px; + overflow: hidden; + text-overflow: ellipsis; + display: inline-block; + cursor: pointer; +} + +.ellipsis-wrap { + white-space: nowrap; +} + +@media (min-width: 1200px) { + .ellipsis { + width: 420px; + } +} + @media (min-width: 992px) { #stats { position: fixed; diff --git a/src/Hangfire.Core/Dashboard/Content/resx/Strings.Designer.cs b/src/Hangfire.Core/Dashboard/Content/resx/Strings.Designer.cs index a34d66f2b..ddb7f1660 100644 --- a/src/Hangfire.Core/Dashboard/Content/resx/Strings.Designer.cs +++ b/src/Hangfire.Core/Dashboard/Content/resx/Strings.Designer.cs @@ -62,6 +62,15 @@ public class Strings { } } + /// + /// Looks up a localized string similar to Arguments. + /// + public static string Arguments { + get { + return ResourceManager.GetString("Arguments", resourceCulture); + } + } + /// /// Looks up a localized string similar to Don't worry, continuations are working as expected. But your current job storage does not support some queries required to show this page. Please try to update your storage or wait until the full command set is implemented.. /// diff --git a/src/Hangfire.Core/Dashboard/Content/resx/Strings.es.resx b/src/Hangfire.Core/Dashboard/Content/resx/Strings.es.resx index 7afba62fd..6a4eb6540 100644 --- a/src/Hangfire.Core/Dashboard/Content/resx/Strings.es.resx +++ b/src/Hangfire.Core/Dashboard/Content/resx/Strings.es.resx @@ -517,4 +517,7 @@ Completados + + Argumentos + \ No newline at end of file diff --git a/src/Hangfire.Core/Dashboard/Content/resx/Strings.fa.resx b/src/Hangfire.Core/Dashboard/Content/resx/Strings.fa.resx index 21457c958..3d75095f8 100644 --- a/src/Hangfire.Core/Dashboard/Content/resx/Strings.fa.resx +++ b/src/Hangfire.Core/Dashboard/Content/resx/Strings.fa.resx @@ -517,4 +517,7 @@ موفقیت آمیز + + استدلال + \ No newline at end of file diff --git a/src/Hangfire.Core/Dashboard/Content/resx/Strings.nl.resx b/src/Hangfire.Core/Dashboard/Content/resx/Strings.nl.resx index 1d9385b14..be02f91c3 100644 --- a/src/Hangfire.Core/Dashboard/Content/resx/Strings.nl.resx +++ b/src/Hangfire.Core/Dashboard/Content/resx/Strings.nl.resx @@ -539,4 +539,7 @@ Mogelijk afgebroken + + Argumenten + \ No newline at end of file diff --git a/src/Hangfire.Core/Dashboard/Content/resx/Strings.pt-BR.resx b/src/Hangfire.Core/Dashboard/Content/resx/Strings.pt-BR.resx index f3f561d23..93b30ed92 100644 --- a/src/Hangfire.Core/Dashboard/Content/resx/Strings.pt-BR.resx +++ b/src/Hangfire.Core/Dashboard/Content/resx/Strings.pt-BR.resx @@ -517,4 +517,7 @@ Concluídos + + Argumentos + \ No newline at end of file diff --git a/src/Hangfire.Core/Dashboard/Content/resx/Strings.pt-PT.resx b/src/Hangfire.Core/Dashboard/Content/resx/Strings.pt-PT.resx index 65b271069..81af53870 100644 --- a/src/Hangfire.Core/Dashboard/Content/resx/Strings.pt-PT.resx +++ b/src/Hangfire.Core/Dashboard/Content/resx/Strings.pt-PT.resx @@ -542,4 +542,7 @@ Erro + + Argumentos + \ No newline at end of file diff --git a/src/Hangfire.Core/Dashboard/Content/resx/Strings.pt.resx b/src/Hangfire.Core/Dashboard/Content/resx/Strings.pt.resx index 65b271069..81af53870 100644 --- a/src/Hangfire.Core/Dashboard/Content/resx/Strings.pt.resx +++ b/src/Hangfire.Core/Dashboard/Content/resx/Strings.pt.resx @@ -542,4 +542,7 @@ Erro + + Argumentos + \ No newline at end of file diff --git a/src/Hangfire.Core/Dashboard/Content/resx/Strings.resx b/src/Hangfire.Core/Dashboard/Content/resx/Strings.resx index 55edada52..6bd682789 100644 --- a/src/Hangfire.Core/Dashboard/Content/resx/Strings.resx +++ b/src/Hangfire.Core/Dashboard/Content/resx/Strings.resx @@ -545,4 +545,7 @@ Error + + Arguments + \ No newline at end of file diff --git a/src/Hangfire.Core/Dashboard/Content/resx/Strings.zh-TW.resx b/src/Hangfire.Core/Dashboard/Content/resx/Strings.zh-TW.resx index 4ca1bc472..8eed2d522 100644 --- a/src/Hangfire.Core/Dashboard/Content/resx/Strings.zh-TW.resx +++ b/src/Hangfire.Core/Dashboard/Content/resx/Strings.zh-TW.resx @@ -516,4 +516,7 @@ 完成 + + 論點 + \ No newline at end of file diff --git a/src/Hangfire.Core/Dashboard/Content/resx/Strings.zh.resx b/src/Hangfire.Core/Dashboard/Content/resx/Strings.zh.resx index cacd5b69b..ba6b46cc5 100644 --- a/src/Hangfire.Core/Dashboard/Content/resx/Strings.zh.resx +++ b/src/Hangfire.Core/Dashboard/Content/resx/Strings.zh.resx @@ -527,4 +527,7 @@ 完成 + + 论点 + \ No newline at end of file diff --git a/src/Hangfire.Core/Dashboard/HtmlHelper.cs b/src/Hangfire.Core/Dashboard/HtmlHelper.cs index 435931220..c4a2e2745 100644 --- a/src/Hangfire.Core/Dashboard/HtmlHelper.cs +++ b/src/Hangfire.Core/Dashboard/HtmlHelper.cs @@ -28,6 +28,7 @@ using Hangfire.Annotations; using Hangfire.Dashboard.Pages; using Hangfire.Dashboard.Resources; +using Newtonsoft.Json; namespace Hangfire.Dashboard { @@ -107,6 +108,12 @@ public NonEscapedString PerPageSelector([NotNull] Pager pager) return RenderPartial(new PerPageSelector(pager)); } + public NonEscapedString JobArguments(Job job) + { + var serialized = JsonConvert.SerializeObject(job?.Args, Formatting.Indented); + return Raw($"{HtmlEncode(serialized)}"); + } + public NonEscapedString RenderPartial(RazorPage partialPage) { partialPage.Assign(_page); diff --git a/src/Hangfire.Core/Dashboard/Pages/AwaitingJobsPage.cshtml b/src/Hangfire.Core/Dashboard/Pages/AwaitingJobsPage.cshtml index 0fbccdf65..fdb7eb459 100644 --- a/src/Hangfire.Core/Dashboard/Pages/AwaitingJobsPage.cshtml +++ b/src/Hangfire.Core/Dashboard/Pages/AwaitingJobsPage.cshtml @@ -78,11 +78,15 @@ @if (!IsReadOnly) { - + } @Strings.Common_Id @Strings.Common_Job + @if (DashboardOptions.DisplayArgumentsInLists) + { + @Strings.Arguments + } @Strings.AwaitingJobsPage_Table_Options @Strings.AwaitingJobsPage_Table_Parent @Strings.Common_Created @@ -118,13 +122,19 @@ @if (jobData == null) { - @Strings.Common_JobExpired + @Strings.Common_JobExpired } else { @Html.JobNameLink(jobId, jobData.Job) + if (DashboardOptions.DisplayArgumentsInLists) + { + + @Html.JobArguments(jobData.Job) + + } @if (stateData != null && stateData.Data.ContainsKey("Options") && !String.IsNullOrWhiteSpace(stateData.Data["Options"])) { diff --git a/src/Hangfire.Core/Dashboard/Pages/AwaitingJobsPage.cshtml.cs b/src/Hangfire.Core/Dashboard/Pages/AwaitingJobsPage.cshtml.cs index 17ecf07f8..82050f5d1 100644 --- a/src/Hangfire.Core/Dashboard/Pages/AwaitingJobsPage.cshtml.cs +++ b/src/Hangfire.Core/Dashboard/Pages/AwaitingJobsPage.cshtml.cs @@ -1,11 +1,11 @@ #pragma warning disable 1591 //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Ce code a été généré par un outil. +// Version du runtime :4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. // //------------------------------------------------------------------------------ @@ -313,8 +313,8 @@ public override void Execute() #line default #line hidden WriteLiteral(" \r\n " + -" \r\n " + -" \r\n"); +" \r\n " + +" \r\n"); @@ -344,11 +344,42 @@ public override void Execute() #line default #line hidden -WriteLiteral("\r\n "); +WriteLiteral("\r\n"); #line 86 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + if (DashboardOptions.DisplayArgumentsInLists) + { + + + #line default + #line hidden +WriteLiteral(" "); + + + + #line 88 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + Write(Strings.Arguments); + + + #line default + #line hidden +WriteLiteral("\r\n"); + + + + #line 89 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + } + + + #line default + #line hidden +WriteLiteral(" "); + + + + #line 90 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(Strings.AwaitingJobsPage_Table_Options); @@ -358,7 +389,7 @@ public override void Execute() - #line 87 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 91 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(Strings.AwaitingJobsPage_Table_Parent); @@ -368,7 +399,7 @@ public override void Execute() - #line 88 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 92 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(Strings.Common_Created); @@ -379,7 +410,7 @@ public override void Execute() - #line 92 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 96 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" foreach (var jobId in jobIds) { JobData jobData; @@ -405,7 +436,7 @@ public override void Execute() - #line 109 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 113 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(jobData != null ? "hover" : null); @@ -415,7 +446,7 @@ public override void Execute() - #line 110 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 114 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" if (!IsReadOnly) { @@ -428,7 +459,7 @@ public override void Execute() - #line 113 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 117 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(jobId); @@ -438,7 +469,7 @@ public override void Execute() - #line 115 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 119 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" } @@ -449,7 +480,7 @@ public override void Execute() - #line 117 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 121 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(Html.JobIdLink(jobId)); @@ -459,19 +490,29 @@ public override void Execute() - #line 119 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 123 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" if (jobData == null) { #line default #line hidden -WriteLiteral(" "); +WriteLiteral(" "); + + + + #line 125 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + Write(Strings.Common_JobExpired); #line default @@ -480,7 +521,7 @@ public override void Execute() - #line 122 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 126 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" } else { @@ -493,7 +534,7 @@ public override void Execute() - #line 126 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 130 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(Html.JobNameLink(jobId, jobData.Job)); @@ -502,12 +543,40 @@ public override void Execute() WriteLiteral("\r\n \r\n"); + + #line 132 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + if (DashboardOptions.DisplayArgumentsInLists) + { + + + #line default + #line hidden +WriteLiteral(" \r\n" + +" "); + + + + #line 135 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + Write(Html.JobArguments(jobData.Job)); + + + #line default + #line hidden +WriteLiteral("\r\n \r\n"); + + + + #line 137 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + } + + #line default + #line hidden WriteLiteral(" \r\n"); - #line 129 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 139 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" if (stateData != null && stateData.Data.ContainsKey("Options") && !String.IsNullOrWhiteSpace(stateData.Data["Options"])) { var optionsDescription = stateData.Data["Options"]; @@ -523,7 +592,7 @@ public override void Execute() - #line 136 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 146 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(optionsDescription); @@ -533,7 +602,7 @@ public override void Execute() - #line 137 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 147 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" } else { @@ -545,7 +614,7 @@ public override void Execute() - #line 140 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 150 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(Strings.Common_NotAvailable); @@ -555,7 +624,7 @@ public override void Execute() - #line 141 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 151 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" } @@ -569,7 +638,7 @@ public override void Execute() - #line 144 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 154 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" if (parentStateData != null) { @@ -580,7 +649,7 @@ public override void Execute() - #line 146 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 156 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(Url.JobDetails(stateData.Data["ParentId"])); @@ -591,7 +660,7 @@ public override void Execute() - #line 147 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 157 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write($"background-color: {JobHistoryRenderer.GetForegroundStateColor(parentStateData.Name)};"); @@ -601,7 +670,7 @@ public override void Execute() - #line 148 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 158 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(parentStateData.Name); @@ -612,7 +681,7 @@ public override void Execute() - #line 151 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 161 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" } else { @@ -624,7 +693,7 @@ public override void Execute() - #line 154 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 164 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(Strings.Common_NotAvailable); @@ -634,7 +703,7 @@ public override void Execute() - #line 155 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 165 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" } @@ -649,7 +718,7 @@ public override void Execute() - #line 158 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 168 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(Html.RelativeTime(jobData.CreatedAt)); @@ -659,7 +728,7 @@ public override void Execute() - #line 160 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 170 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" } @@ -669,7 +738,7 @@ public override void Execute() - #line 162 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 172 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" } @@ -680,7 +749,7 @@ public override void Execute() - #line 166 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 176 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(Html.Paginator(pager)); @@ -690,7 +759,7 @@ public override void Execute() - #line 168 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 178 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" } else { @@ -702,7 +771,7 @@ public override void Execute() - #line 172 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 182 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" Write(Strings.AwaitingJobsPage_NoJobs); @@ -712,7 +781,7 @@ public override void Execute() - #line 174 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" + #line 184 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" } diff --git a/src/Hangfire.Core/Dashboard/Pages/DeletedJobsPage.cshtml b/src/Hangfire.Core/Dashboard/Pages/DeletedJobsPage.cshtml index dae367c46..2bd92a361 100644 --- a/src/Hangfire.Core/Dashboard/Pages/DeletedJobsPage.cshtml +++ b/src/Hangfire.Core/Dashboard/Pages/DeletedJobsPage.cshtml @@ -53,11 +53,15 @@ @if (!IsReadOnly) { - + } @Strings.Common_Id @Strings.Common_Job + @if (DashboardOptions.DisplayArgumentsInLists) + { + @Strings.Arguments + } @Strings.DeletedJobsPage_Table_Deleted @@ -84,13 +88,19 @@ @if (job.Value == null) { - @Strings.Common_JobExpired + @Strings.Common_JobExpired } else { @Html.JobNameLink(job.Key, job.Value.Job) + if (DashboardOptions.DisplayArgumentsInLists) + { + + @Html.JobArguments(job.Value.Job) + + } @if (job.Value.DeletedAt.HasValue) { diff --git a/src/Hangfire.Core/Dashboard/Pages/DeletedJobsPage.cshtml.cs b/src/Hangfire.Core/Dashboard/Pages/DeletedJobsPage.cshtml.cs index 65870099c..791696c70 100644 --- a/src/Hangfire.Core/Dashboard/Pages/DeletedJobsPage.cshtml.cs +++ b/src/Hangfire.Core/Dashboard/Pages/DeletedJobsPage.cshtml.cs @@ -1,11 +1,11 @@ #pragma warning disable 1591 //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Ce code a été généré par un outil. +// Version du runtime :4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. // //------------------------------------------------------------------------------ @@ -207,8 +207,8 @@ public override void Execute() #line default #line hidden WriteLiteral(" \r\n " + -" \r\n " + -" \r\n"); +" \r\n " + +" \r\n"); @@ -238,11 +238,42 @@ public override void Execute() #line default #line hidden -WriteLiteral("\r\n "); +WriteLiteral("\r\n"); #line 61 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + if (DashboardOptions.DisplayArgumentsInLists) + { + + + #line default + #line hidden +WriteLiteral(" "); + + + + #line 63 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + Write(Strings.Arguments); + + + #line default + #line hidden +WriteLiteral("\r\n"); + + + + #line 64 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + } + + + #line default + #line hidden +WriteLiteral(" "); + + + + #line 65 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" Write(Strings.DeletedJobsPage_Table_Deleted); @@ -253,7 +284,7 @@ public override void Execute() - #line 65 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 69 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" foreach (var job in jobs) { @@ -264,7 +295,7 @@ public override void Execute() - #line 67 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 71 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" Write(job.Value == null || !job.Value.InDeletedState ? "obsolete-data" : null); @@ -274,7 +305,7 @@ public override void Execute() - #line 67 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 71 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" Write(job.Value != null && job.Value.InDeletedState && job.Value != null ? "hover" : null); @@ -284,7 +315,7 @@ public override void Execute() - #line 68 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 72 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" if (!IsReadOnly) { @@ -295,7 +326,7 @@ public override void Execute() - #line 71 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 75 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" if (job.Value == null || job.Value.InDeletedState) { @@ -307,7 +338,7 @@ public override void Execute() - #line 73 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 77 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" Write(job.Key); @@ -317,7 +348,7 @@ public override void Execute() - #line 74 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 78 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" } @@ -327,7 +358,7 @@ public override void Execute() - #line 76 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 80 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" } @@ -338,7 +369,7 @@ public override void Execute() - #line 78 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 82 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" Write(Html.JobIdLink(job.Key)); @@ -348,7 +379,7 @@ public override void Execute() - #line 79 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 83 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" if (job.Value != null && !job.Value.InDeletedState) { @@ -359,7 +390,7 @@ public override void Execute() - #line 81 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 85 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" Write(Strings.Common_JobStateChanged_Text); @@ -369,7 +400,7 @@ public override void Execute() - #line 82 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 86 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" } @@ -379,19 +410,29 @@ public override void Execute() - #line 85 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 89 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" if (job.Value == null) { #line default #line hidden -WriteLiteral(" "); +WriteLiteral(" "); + + + + #line 91 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + Write(Strings.Common_JobExpired); #line default @@ -400,7 +441,7 @@ public override void Execute() - #line 88 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 92 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" } else { @@ -413,7 +454,7 @@ public override void Execute() - #line 92 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 96 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" Write(Html.JobNameLink(job.Key, job.Value.Job)); @@ -422,12 +463,40 @@ public override void Execute() WriteLiteral("\r\n \r\n"); + + #line 98 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + if (DashboardOptions.DisplayArgumentsInLists) + { + + + #line default + #line hidden +WriteLiteral(" \r\n" + +" "); + + + #line 101 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + Write(Html.JobArguments(job.Value.Job)); + + + #line default + #line hidden +WriteLiteral("\r\n \r\n"); + + + + #line 103 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + } + + + #line default + #line hidden WriteLiteral(" \r\n"); - #line 95 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 105 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" if (job.Value.DeletedAt.HasValue) { @@ -435,14 +504,14 @@ public override void Execute() #line default #line hidden - #line 97 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 107 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" Write(Html.RelativeTime(job.Value.DeletedAt.Value)); #line default #line hidden - #line 97 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 107 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" } @@ -453,7 +522,7 @@ public override void Execute() - #line 100 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 110 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" } @@ -463,7 +532,7 @@ public override void Execute() - #line 102 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 112 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" } @@ -474,7 +543,7 @@ public override void Execute() - #line 107 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 117 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" Write(Html.Paginator(pager)); @@ -484,7 +553,7 @@ public override void Execute() - #line 109 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" + #line 119 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" } diff --git a/src/Hangfire.Core/Dashboard/Pages/EnqueuedJobsPage.cshtml b/src/Hangfire.Core/Dashboard/Pages/EnqueuedJobsPage.cshtml index c0960c7a4..262b0e191 100644 --- a/src/Hangfire.Core/Dashboard/Pages/EnqueuedJobsPage.cshtml +++ b/src/Hangfire.Core/Dashboard/Pages/EnqueuedJobsPage.cshtml @@ -68,6 +68,10 @@ @Strings.Common_Id @Strings.Common_State @Strings.Common_Job + @if (DashboardOptions.DisplayArgumentsInLists) + { + @Strings.Arguments + } @Strings.Common_Enqueued @@ -80,7 +84,7 @@ @if (job.Value != null) { - + } } @@ -93,7 +97,7 @@ @if (job.Value == null) { - @Strings.Common_JobExpired + @Strings.Common_JobExpired } else { @@ -103,6 +107,12 @@ @Html.JobNameLink(job.Key, job.Value.Job) + if (DashboardOptions.DisplayArgumentsInLists) + { + + @Html.JobArguments(job.Value.Job) + + } @if (job.Value.EnqueuedAt.HasValue) { diff --git a/src/Hangfire.Core/Dashboard/Pages/EnqueuedJobsPage.cshtml.cs b/src/Hangfire.Core/Dashboard/Pages/EnqueuedJobsPage.cshtml.cs index 9cfd27354..9b43d12c5 100644 --- a/src/Hangfire.Core/Dashboard/Pages/EnqueuedJobsPage.cshtml.cs +++ b/src/Hangfire.Core/Dashboard/Pages/EnqueuedJobsPage.cshtml.cs @@ -1,11 +1,11 @@ #pragma warning disable 1591 //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Ce code a été généré par un outil. +// Version du runtime :4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. // //------------------------------------------------------------------------------ @@ -294,11 +294,42 @@ public override void Execute() #line default #line hidden -WriteLiteral("\r\n "); +WriteLiteral("\r\n"); #line 71 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + if (DashboardOptions.DisplayArgumentsInLists) + { + + + #line default + #line hidden +WriteLiteral(" "); + + + + #line 73 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + Write(Strings.Arguments); + + + #line default + #line hidden +WriteLiteral("\r\n"); + + + + #line 74 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + } + + + #line default + #line hidden +WriteLiteral(" "); + + + + #line 75 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" Write(Strings.Common_Enqueued); @@ -309,7 +340,7 @@ public override void Execute() - #line 75 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 79 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" foreach (var job in enqueuedJobs) { @@ -320,7 +351,7 @@ public override void Execute() - #line 77 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 81 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" Write(job.Value == null || !job.Value.InEnqueuedState ? "obsolete-data" : null); @@ -330,7 +361,7 @@ public override void Execute() - #line 78 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 82 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" if (!IsReadOnly) { @@ -341,7 +372,7 @@ public override void Execute() - #line 81 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 85 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" if (job.Value != null) { @@ -353,17 +384,17 @@ public override void Execute() - #line 83 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 87 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" Write(job.Key); #line default #line hidden -WriteLiteral("\"/>\r\n"); +WriteLiteral("\" />\r\n"); - #line 84 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 88 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" } @@ -373,7 +404,7 @@ public override void Execute() - #line 86 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 90 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" } @@ -384,7 +415,7 @@ public override void Execute() - #line 88 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 92 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" Write(Html.JobIdLink(job.Key)); @@ -394,7 +425,7 @@ public override void Execute() - #line 89 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 93 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" if (job.Value != null && !job.Value.InEnqueuedState) { @@ -405,7 +436,7 @@ public override void Execute() - #line 91 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 95 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" Write(Strings.Common_JobStateChanged_Text); @@ -415,7 +446,7 @@ public override void Execute() - #line 92 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 96 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" } @@ -425,19 +456,29 @@ public override void Execute() - #line 94 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 98 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" if (job.Value == null) { #line default #line hidden -WriteLiteral(" "); +WriteLiteral(" "); + + + + #line 100 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + Write(Strings.Common_JobExpired); #line default @@ -446,7 +487,7 @@ public override void Execute() - #line 97 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 101 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" } else { @@ -459,7 +500,7 @@ public override void Execute() - #line 101 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 105 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" Write(Html.StateLabel(job.Value.State)); @@ -474,7 +515,7 @@ public override void Execute() - #line 104 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 108 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" Write(Html.JobNameLink(job.Key, job.Value.Job)); @@ -483,12 +524,40 @@ public override void Execute() WriteLiteral("\r\n \r\n"); + + #line 110 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + if (DashboardOptions.DisplayArgumentsInLists) + { + + + #line default + #line hidden +WriteLiteral(" \r\n " + +" "); + + + #line 113 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + Write(Html.JobArguments(job.Value.Job)); + + + #line default + #line hidden +WriteLiteral("\r\n \r\n"); + + + + #line 115 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + } + + + #line default + #line hidden WriteLiteral(" \r\n"); - #line 107 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 117 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" if (job.Value.EnqueuedAt.HasValue) { @@ -496,14 +565,14 @@ public override void Execute() #line default #line hidden - #line 109 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 119 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" Write(Html.RelativeTime(job.Value.EnqueuedAt.Value)); #line default #line hidden - #line 109 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 119 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" } else @@ -516,7 +585,7 @@ public override void Execute() - #line 113 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 123 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" Write(Strings.Common_NotAvailable); @@ -526,7 +595,7 @@ public override void Execute() - #line 114 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 124 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" } @@ -536,7 +605,7 @@ public override void Execute() - #line 116 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 126 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" } @@ -546,7 +615,7 @@ public override void Execute() - #line 118 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 128 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" } @@ -557,7 +626,7 @@ public override void Execute() - #line 123 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 133 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" Write(Html.Paginator(pager)); @@ -567,7 +636,7 @@ public override void Execute() - #line 125 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" + #line 135 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" } diff --git a/src/Hangfire.Core/Dashboard/Pages/FailedJobsPage.cshtml b/src/Hangfire.Core/Dashboard/Pages/FailedJobsPage.cshtml index a3a161731..2ecbaa21f 100644 --- a/src/Hangfire.Core/Dashboard/Pages/FailedJobsPage.cshtml +++ b/src/Hangfire.Core/Dashboard/Pages/FailedJobsPage.cshtml @@ -69,11 +69,15 @@ @if (!IsReadOnly) { - + } @Strings.Common_Id @Strings.Common_Job + @if (DashboardOptions.DisplayArgumentsInLists) + { + @Strings.Arguments + } @Strings.FailedJobsPage_Table_Failed @@ -100,7 +104,7 @@ @if (job.Value == null) { - + @Strings.Common_JobExpired } @@ -110,6 +114,12 @@
@Html.JobNameLink(job.Key, job.Value.Job)
+ @if (DashboardOptions.DisplayArgumentsInLists) + { + + @Html.JobArguments(job.Value.Job) + + } @if (!String.IsNullOrEmpty(job.Value.ExceptionMessage)) {
@@ -128,7 +138,7 @@ if (job.Value != null && job.Value.InFailedState) { - +