- {% bootstrap_messages %} + {% include 'tom_common/partials/messages.html' %}
{% block content %} {% endblock %} diff --git a/tom_common/templates/tom_common/partials/messages.html b/tom_common/templates/tom_common/partials/messages.html new file mode 100644 index 000000000..e7420a39b --- /dev/null +++ b/tom_common/templates/tom_common/partials/messages.html @@ -0,0 +1,4 @@ +{% load bootstrap4 %} +
+ {% bootstrap_messages %} +
diff --git a/tom_targets/templates/tom_targets/partials/observation_table.html b/tom_targets/templates/tom_targets/partials/observation_table.html new file mode 100644 index 000000000..535d1b31b --- /dev/null +++ b/tom_targets/templates/tom_targets/partials/observation_table.html @@ -0,0 +1,4 @@ +{% load observation_extras %} +
+{% observation_list object %} +{% include 'tom_common/partials/messages.html' %} diff --git a/tom_targets/templates/tom_targets/target_detail.html b/tom_targets/templates/tom_targets/target_detail.html index 9c3ca35c6..f2950af7d 100644 --- a/tom_targets/templates/tom_targets/target_detail.html +++ b/tom_targets/templates/tom_targets/target_detail.html @@ -91,8 +91,15 @@

Plan

{% existing_observation_form object %}

Observations

- Update Observations Status - {% observation_list object %} + +
+ {% include 'tom_targets/partials/observation_table.html' %} +
{% if user.is_authenticated %} diff --git a/tom_targets/urls.py b/tom_targets/urls.py index e364a0a30..4086bb6b5 100644 --- a/tom_targets/urls.py +++ b/tom_targets/urls.py @@ -1,6 +1,6 @@ from django.urls import path -from .views import TargetCreateView, TargetUpdateView, TargetDetailView, TargetNameSearchView +from .views import TargetCreateView, TargetUpdateView, TargetDetailView, TargetNameSearchView, render_observation_table from .views import TargetDeleteView, TargetListView, TargetImportView, TargetExportView, TargetShareView from .views import (TargetGroupingView, TargetGroupingDeleteView, TargetGroupingCreateView, TargetAddRemoveGroupingView, TargetMergeView, TargetPersistentShareManageFormView, @@ -36,6 +36,7 @@ path('/share/', TargetShareView.as_view(), name='share'), path('/hermes-preload/', TargetHermesPreloadView.as_view(), name='hermes-preload'), path('/', TargetDetailView.as_view(), name='detail'), + path('/observation-list/', render_observation_table, name='render-observation-table'), path('targetgrouping//delete/', TargetGroupingDeleteView.as_view(), name='delete-group'), path('targetgrouping/create/', TargetGroupingCreateView.as_view(), name='create-group'), path('targetgrouping//share/', TargetGroupingShareView.as_view(), name='share-group'), diff --git a/tom_targets/views.py b/tom_targets/views.py index af913937f..18c0b2024 100644 --- a/tom_targets/views.py +++ b/tom_targets/views.py @@ -1,3 +1,4 @@ +from django.contrib.auth.decorators import login_required import logging from datetime import datetime, timedelta @@ -525,6 +526,14 @@ def get(self, request, *args, **kwargs): return super().get(request, *args, **kwargs) +@login_required +def render_observation_table(request, pk): + out = StringIO() + call_command('updatestatus', target_id=pk, stdout=out) + messages.info(request, out.getvalue()) + return render(request, 'tom_targets/partials/observation_table.html', context={'object': Target.objects.get(id=pk)}) + + class TargetHermesPreloadView(SingleObjectMixin, View): model = Target # Set app_name for Django-Guardian Permissions in case of Custom Target Model