Render the jobset page correctly when there are fetch errors
The original code would return standard "Please come back later" page when there are only fetch errors on a newly setup declarative project. The problem is that there are two types of errors: standard errors and fetch errors. Each is acompanied by a corresponding field for time of occurence. Standard errors use 'errortime', while fetch errors have 'lastchecktime' set to the time of the error. Unfortunately, jobset.tt file was only using 'errortime' for displaying the time. This would result in the following errors in logs: Couldn't render template "date error - bad time/date string: expects 'hⓂ️s dⓂ️y' got: '' This change includes using 'lastchecktime' when rendering the error times.
This commit is contained in:
parent
03f14f46d7
commit
0f21e4067b
|
@ -119,7 +119,7 @@
|
||||||
|
|
||||||
[% IF jobset.errormsg || jobset.fetcherrormsg %]
|
[% IF jobset.errormsg || jobset.fetcherrormsg %]
|
||||||
<div id="tabs-errors" class="tab-pane">
|
<div id="tabs-errors" class="tab-pane">
|
||||||
<p>Errors occurred at [% INCLUDE renderDateTime timestamp=jobset.errortime %].</p>
|
<p>Errors occurred at [% INCLUDE renderDateTime timestamp=(jobset.errortime || jobset.lastcheckedtime) %].</p>
|
||||||
<pre class="alert alert-error">[% HTML.escape(jobset.fetcherrormsg || jobset.errormsg) %]</pre>
|
<pre class="alert alert-error">[% HTML.escape(jobset.fetcherrormsg || jobset.errormsg) %]</pre>
|
||||||
</div>
|
</div>
|
||||||
[% END %]
|
[% END %]
|
||||||
|
|
Loading…
Reference in a new issue