mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-08 17:33:12 -04:00
Merge pull request #921 from alphagov/fix-ajax-probs
Fix problem with AJAX not updating scheduled jobs
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
{% from "components/pill.html" import pill %}
|
{% from "components/pill.html" import pill %}
|
||||||
|
|
||||||
<div class="bottom-gutter">
|
<div class="bottom-gutter ajax-block-container">
|
||||||
{{ pill('Status', counts, request.args.get('status', '')) }}
|
{{ pill('Status', counts, request.args.get('status', '')) }}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{% from "components/table.html" import list_table, field, right_aligned_field_heading, date_field, row_heading %}
|
{% from "components/table.html" import list_table, field, right_aligned_field_heading, date_field, row_heading %}
|
||||||
|
|
||||||
|
<div class="ajax-block-container">
|
||||||
{% if job.job_status == 'scheduled' %}
|
{% if job.job_status == 'scheduled' %}
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
@@ -69,3 +70,4 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<div>
|
<div class="ajax-block-container">
|
||||||
<p class='heading-small bottom-gutter'>
|
<p class='heading-small bottom-gutter'>
|
||||||
Uploaded by {{ job.created_by.name }} on {{ job.created_at|format_datetime_short }}
|
Uploaded by {{ job.created_by.name }} on {{ job.created_at|format_datetime_short }}
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
|
{% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
|
||||||
{% from "components/big-number.html" import big_number -%}
|
{% from "components/big-number.html" import big_number -%}
|
||||||
|
|
||||||
<div class='dashboard-table'>
|
<div class='dashboard-table ajax-block-container'>
|
||||||
{% call(item, row_number) list_table(
|
{% call(item, row_number) list_table(
|
||||||
jobs,
|
jobs,
|
||||||
caption="Recent files uploaded",
|
caption="Recent files uploaded",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{% from "components/big-number.html" import big_number_with_status %}
|
{% from "components/big-number.html" import big_number_with_status %}
|
||||||
{% from "components/message-count-label.html" import message_count_label %}
|
{% from "components/message-count-label.html" import message_count_label %}
|
||||||
|
|
||||||
<div class="grid-row">
|
<div class="grid-row ajax-block-container">
|
||||||
<div class="column-half">
|
<div class="column-half">
|
||||||
{{ big_number_with_status(
|
{{ big_number_with_status(
|
||||||
statistics['email']['requested'],
|
statistics['email']['requested'],
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
{% from "components/big-number.html" import big_number %}
|
{% from "components/big-number.html" import big_number %}
|
||||||
{% from "components/show-more.html" import show_more %}
|
{% from "components/show-more.html" import show_more %}
|
||||||
|
|
||||||
|
<div class="ajax-block-container">
|
||||||
{% if scheduled_jobs %}
|
{% if scheduled_jobs %}
|
||||||
<div class='dashboard-table'>
|
<div class='dashboard-table'>
|
||||||
<h2 class="heading-medium">
|
<h2 class="heading-medium">
|
||||||
@@ -36,3 +37,4 @@
|
|||||||
{{ show_more() }}
|
{{ show_more() }}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{% from "components/big-number.html" import big_number %}
|
{% from "components/big-number.html" import big_number %}
|
||||||
|
|
||||||
<div class='grid-row'>
|
<div class='grid-row ajax-block-container'>
|
||||||
<div class='column-half'>
|
<div class='column-half'>
|
||||||
<div class="keyline-block">
|
<div class="keyline-block">
|
||||||
{{ big_number("Unlimited", 'free email allowance', smaller=True) }}
|
{{ big_number("Unlimited", 'free email allowance', smaller=True) }}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"babel-core": "6.3.26",
|
"babel-core": "6.3.26",
|
||||||
"babel-preset-es2015": "6.3.13",
|
"babel-preset-es2015": "6.3.13",
|
||||||
"diff-dom": "2.0.3",
|
"diff-dom": "2.1.0",
|
||||||
"govuk-elements-sass": "1.1.1",
|
"govuk-elements-sass": "1.1.1",
|
||||||
"govuk_frontend_toolkit": "4.6.0",
|
"govuk_frontend_toolkit": "4.6.0",
|
||||||
"govuk_template_jinja": "https://github.com/alphagov/govuk_template/releases/download/v0.18.0/jinja_govuk_template-0.18.0.tgz",
|
"govuk_template_jinja": "https://github.com/alphagov/govuk_template/releases/download/v0.18.0/jinja_govuk_template-0.18.0.tgz",
|
||||||
|
|||||||
Reference in New Issue
Block a user