Fixes #5066: Update view_reportresult to view_report permission

This commit is contained in:
Jeremy Stretch
2020-09-23 13:40:15 -04:00
parent 90dbe9bf60
commit 0a40418614
5 changed files with 10 additions and 8 deletions

View File

@@ -25,7 +25,7 @@ class Command(BaseCommand):
for report in report_list:
if module_name in options['reports'] or report.full_name in options['reports']:
# Run the report and create a new ReportResult
# Run the report and create a new JobResult
self.stdout.write(
"[{:%H:%M:%S}] Running {}...".format(timezone.now(), report.full_name)
)

View File

@@ -315,7 +315,7 @@ class ReportListView(ContentTypePermissionRequiredMixin, View):
Retrieve all of the available reports from disk and the recorded JobResult (if any) for each.
"""
def get_required_permission(self):
return 'extras.view_reportresult'
return 'extras.view_report'
def get(self, request):
@@ -347,7 +347,7 @@ class ReportView(ContentTypePermissionRequiredMixin, View):
Display a single Report and its associated JobResult (if any).
"""
def get_required_permission(self):
return 'extras.view_reportresult'
return 'extras.view_report'
def get(self, request, module, name):
@@ -401,7 +401,7 @@ class ReportResultView(ContentTypePermissionRequiredMixin, View):
Display a JobResult pertaining to the execution of a Report.
"""
def get_required_permission(self):
return 'extras.view_reportresult'
return 'extras.view_report'
def get(self, request, job_result_pk):
report_content_type = ContentType.objects.get(app_label='extras', model='report')

View File

@@ -276,7 +276,7 @@
<div class="panel-heading">
<strong>Reports</strong>
</div>
{% if report_results and perms.extras.view_reportresult %}
{% if report_results and perms.extras.view_report %}
<table class="table table-hover panel-body">
{% for result in report_results %}
<tr>
@@ -285,7 +285,7 @@
</tr>
{% endfor %}
</table>
{% elif perms.extras.view_reportresult %}
{% elif perms.extras.view_report %}
<div class="panel-body text-muted">
None found
</div>

View File

@@ -518,7 +518,7 @@
<li{% if not perms.extras.view_script %} class="disabled"{% endif %}>
<a href="{% url 'extras:script_list' %}">Scripts</a>
</li>
<li{% if not perms.extras.view_reportresult %} class="disabled"{% endif %}>
<li{% if not perms.extras.view_report %} class="disabled"{% endif %}>
<a href="{% url 'extras:report_list' %}">Reports</a>
</li>
</ul>