arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-19 14:32:16 +00:00
Code Issues Projects Releases Wiki Activity

FIX: Individual asset version history is now correctly filtered

Browse Source
This commit is contained in:
FreneticScribbler
2019-12-26 14:05:17 +00:00
parent 9953ac0dc1
commit 08600daf7c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
assets/views.py
View File

@@ -207,14 +207,16 @@ class SupplierUpdate(generic.UpdateView):
form_class = forms.SupplierForm form_class = forms.SupplierForm
template_name = 'supplier_update.html' template_name = 'supplier_update.html'
# TODO: Reduce SQL queries
class AssetVersionHistory(versioning.VersionHistory): class AssetVersionHistory(versioning.VersionHistory):
model = versioning.RIGSVersion
template_name = "asset_version_history.html" template_name = "asset_version_history.html"
paginate_by = 25
def get_queryset(self, **kwargs): def get_queryset(self, **kwargs):
thisModel = self.kwargs['model'] thisModel = self.kwargs['model']
pk = self.kwargs['pk']
versions = versioning.RIGSVersion.objects.all() versions = versioning.RIGSVersion.objects.get_for_object(models.Asset.objects.filter(asset_id=pk).get()).select_related("revision", "revision__user").all()
return versions return versions
@@ -232,7 +234,7 @@ class AssetVersionHistory(versioning.VersionHistory):
return context return context
class ActivityTable(generic.ListView): class ActivityTable(versioning.ActivityTable):
model = versioning.RIGSVersion model = versioning.RIGSVersion
template_name = "asset_activity_table.html" template_name = "asset_activity_table.html"
paginate_by = 25 paginate_by = 25