Skip to content

Commit

Permalink
Merge pull request #1122 from amousset/askama-012
Browse files Browse the repository at this point in the history
Bump askama to 0.12
  • Loading branch information
Shnatsel authored Feb 15, 2024
2 parents a5fad26 + 9d2489e commit a8fc440
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion admin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ default = ["gix?/max-performance-safe"]

[dependencies]
abscissa_core = "0.7"
askama = "0.11"
askama = "0.12"
atom_syndication = "0.12"
chrono = { version = "0.4", default-features = false, features = ["clock"] }
clap = "4"
Expand Down
12 changes: 6 additions & 6 deletions admin/src/web/templates/advisory-content.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ <h1>
<dt id="reported">Reported</dt>
<dd>
<time datetime="{{ advisory.date().as_str() }}">
{{ advisory.date() | friendly_date }}
{{ advisory.date()|friendly_date }}
</time>
</dd>

<dt id="issued">Issued</dt>
<dd>
<time datetime="{{ cdate.as_str() }}">
{{ cdate.clone() | friendly_date }}
{{ cdate.clone()|friendly_date }}
</time>
{% if cdate != mdate %}
<time datetime="{{ mdate.as_str() }}">
(last modified: {{ mdate.clone() | friendly_date }})
(last modified: {{ mdate.clone()|friendly_date }})
</time>
{% endif %}
</dd>
Expand All @@ -66,7 +66,7 @@ <h1>
{% match advisory.metadata.informational %}
{% when Some with (informational) %}
<span class="tag info">INFO</span>
{{ informational.to_string() | capitalize }}
{{ informational.to_string()|capitalize }}
{% when None %}
Vulnerability
{% endmatch %}
Expand All @@ -87,7 +87,7 @@ <h1>
<dt id="keywords">Keywords</dt>
<dd>
{% for keyword in advisory.metadata.keywords %}
<a href="/keywords/{{ keyword.as_str() | safe_keyword }}.html">#{{ keyword.as_str() | safe_keyword }}</a>
<a href="/keywords/{{ keyword.as_str()|safe_keyword }}.html">#{{ keyword.as_str()|safe_keyword }}</a>
{% endfor %}
</dd>
{% endif %}
Expand Down Expand Up @@ -154,7 +154,7 @@ <h1>
{% when Some with (cvss) %}
<dt id="cvss_score">CVSS Score</dt>
<dd>{{ cvss.score().value() }} <span class="tag {{ advisory.severity().unwrap() }}">
{{ advisory.severity().unwrap() | upper }}
{{ advisory.severity().unwrap()|upper }}
</span></dd>

<dt id="cvss_details">CVSS Details</dt>
Expand Down
4 changes: 2 additions & 2 deletions admin/src/web/templates/advisory-list-entry.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<li>
<time datetime="{{ cdate.as_str() }}">
{{ cdate.clone() | friendly_date }}
{{ cdate.clone()|friendly_date }}
</time>

{% if advisory.withdrawn() %}
Expand All @@ -12,7 +12,7 @@ <h3><a class="withdrawn" href="/advisories/{{ advisory.id() }}.html">
<h3>
{% match advisory.severity() %}
{% when Some with (severity) %}
<span class="tag {{ severity }}">{{ advisory.severity().unwrap() | upper }}</span>
<span class="tag {{ severity }}">{{ advisory.severity().unwrap()|upper }}</span>
{% when None %}
{% if advisory.metadata.informational.is_some() %}
<span class="tag info">INFO</span>
Expand Down

0 comments on commit a8fc440

Please sign in to comment.