Browse Source

DRY: adding "now_isoformat" template tag

pull/358/head
Pēteris Caune 5 years ago
parent
commit
c596f485a5
No known key found for this signature in database GPG Key ID: E28D7679E9A9EDE2
4 changed files with 8 additions and 6 deletions
  1. +6
    -0
      hc/front/templatetags/hc_extras.py
  2. +0
    -4
      hc/front/views.py
  3. +1
    -1
      templates/integrations/add_shell.html
  4. +1
    -1
      templates/integrations/webhook_form.html

+ 6
- 0
hc/front/templatetags/hc_extras.py View File

@ -4,6 +4,7 @@ from django import template
from django.conf import settings
from django.utils.html import escape
from django.utils.safestring import mark_safe
from django.utils.timezone import now
from hc.lib.date import format_duration, format_approx_duration, format_hms
@ -151,3 +152,8 @@ def fix_asterisks(s):
@register.filter
def format_headers(headers):
return "\n".join("%s: %s" % (k, v) for k, v in headers.items())
@register.simple_tag
def now_isoformat():
return now().replace(microsecond=0).isoformat()

+ 0
- 4
hc/front/views.py View File

@ -179,7 +179,6 @@ def my_checks(request, code):
"checks": checks,
"channels": channels,
"num_down": num_down,
"now": timezone.now(),
"tags": pairs,
"ping_endpoint": settings.PING_ENDPOINT,
"timezones": pytz.all_timezones,
@ -860,7 +859,6 @@ def add_webhook(request, code):
"page": "channels",
"project": project,
"form": form,
"now": timezone.now().replace(microsecond=0).isoformat(),
}
return render(request, "integrations/webhook_form.html", ctx)
@ -896,7 +894,6 @@ def edit_webhook(request, code):
"project": channel.project,
"channel": channel,
"form": form,
"now": timezone.now().replace(microsecond=0).isoformat(),
}
return render(request, "integrations/webhook_form.html", ctx)
@ -921,7 +918,6 @@ def add_shell(request, code):
"page": "channels",
"project": project,
"form": form,
"now": timezone.now().replace(microsecond=0).isoformat(),
}
return render(request, "integrations/add_shell.html", ctx)


+ 1
- 1
templates/integrations/add_shell.html View File

@ -94,7 +94,7 @@
<th><code>$NOW</code></th>
<td>
Current UTC time in ISO8601 format.<br />
Example: "{{ now }}"
Example: "{% now_isoformat %}"
</td>
</tr>
<tr>


+ 1
- 1
templates/integrations/webhook_form.html View File

@ -198,7 +198,7 @@
<th><code>$NOW</code></th>
<td>
Current UTC time in ISO8601 format.<br />
Example: "{{ now }}"
Example: "{% now_isoformat %}"
</td>
</tr>
<tr>


Loading…
Cancel
Save