Skip to content

Commit

Permalink
Slight optimization
Browse files Browse the repository at this point in the history
  • Loading branch information
Sanqui committed Aug 10, 2024
1 parent 7a0dbad commit 59d818b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.
19 changes: 5 additions & 14 deletions rhinventory/models/asset.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,8 @@ def privacy(self, value: Privacy) -> None:


def get_primary_image(self):
sorted_images = self.get_sorted_images()
if sorted_images:
return sorted_images[0]
return None

return self.get_sorted_images().first()

@property
def _query_files(self):
return db.session.query(File) \
Expand All @@ -232,25 +229,19 @@ def get_files_in_categories(self, categories: list[FileCategory]):
return self._query_files \
.filter(
File.category.in_(categories)
).all()
)

def get_sorted_images(self):
return self.get_files_in_categories(IMAGE_CATEGORIES)

def get_primary_dump(self):
sorted_dumps = self.get_dumps()
if sorted_dumps:
return sorted_dumps[0]
return None
return self.get_dumps().first()

def get_dumps(self):
return self.get_files_in_categories([FileCategory.dump])

def get_primary_document(self):
sorted_documents = self.get_files_in_categories([FileCategory.document])
if sorted_documents:
return sorted_documents[0]
return None
return self.get_files_in_categories([FileCategory.document]).first()

@property
def parents(self):
Expand Down
2 changes: 1 addition & 1 deletion rhinventory/templates/admin/asset/_macros.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
{% endif %}
</span>
<span>
{% if asset.get_dumps() %}
{% if asset.get_primary_dump() %}
<a href="{{ asset.url }}">
{{- icon("save") -}}
</a>
Expand Down
2 changes: 1 addition & 1 deletion rhinventory/templates/admin/asset/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ <h2><small>{{ render_asset_code(model) }}</small> {{ model.name }}</h2>
</div>
{% endif %}
{% endmacro %}
{% set images = model.get_sorted_images() %}
{% set images = list(model.get_sorted_images()) %}
{% if images %}
{{ render_asset_image(images[0], primary=True) }}
{% set secondary_images = images[1:] %}
Expand Down

0 comments on commit 59d818b

Please sign in to comment.