|
@@ -151,7 +151,7 @@ class ObjectJournalView(ConditionalLoginRequiredMixin, View):
|
|
|
assigned_object_type=content_type,
|
|
assigned_object_type=content_type,
|
|
|
assigned_object_id=obj.pk
|
|
assigned_object_id=obj.pk
|
|
|
)
|
|
)
|
|
|
- journalentry_table = JournalEntryTable(journalentries, user=request.user)
|
|
|
|
|
|
|
+ journalentry_table = JournalEntryTable(journalentries)
|
|
|
journalentry_table.configure(request)
|
|
journalentry_table.configure(request)
|
|
|
journalentry_table.columns.hide('assigned_object_type')
|
|
journalentry_table.columns.hide('assigned_object_type')
|
|
|
journalentry_table.columns.hide('assigned_object')
|
|
journalentry_table.columns.hide('assigned_object')
|
|
@@ -218,11 +218,7 @@ class ObjectJobsView(ConditionalLoginRequiredMixin, View):
|
|
|
|
|
|
|
|
# Gather all Jobs for this object
|
|
# Gather all Jobs for this object
|
|
|
jobs = self.get_jobs(obj)
|
|
jobs = self.get_jobs(obj)
|
|
|
- jobs_table = JobTable(
|
|
|
|
|
- data=jobs,
|
|
|
|
|
- orderable=False,
|
|
|
|
|
- user=request.user
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ jobs_table = JobTable(data=jobs, orderable=False)
|
|
|
jobs_table.configure(request)
|
|
jobs_table.configure(request)
|
|
|
|
|
|
|
|
# Default to using "<app>/<model>.html" as the template, if it exists. Otherwise,
|
|
# Default to using "<app>/<model>.html" as the template, if it exists. Otherwise,
|