trustchain-oc1-orchestral/devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

refactor responses bool and fix name is_incoming

Browse source
This commit is contained in:
Cayo Puigdefabregas 2022-01-26 11:31:00 +01:00
parent 2e613265a6
commit 0d166b2b0c
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ereuse_devicehub/resources/lot/models.py
View file

@ -105,10 +105,8 @@ class Lot(Thing):
return False if self.trade else True return False if self.trade else True
@property @property
def is_incominig(self): def is_incoming(self):
if self.trade and self.trade.user_to == current_user: return bool(self.trade and self.trade.user_to == current_user)
return True
return False
@property @property
def is_outgoing(self): def is_outgoing(self):

2
ereuse_devicehub/templates/ereuse_devicehub/base_site.html
View file

@ -103,7 +103,7 @@
</a> </a>
<ul id="incoming-lots-nav" class="nav-content collapse" data-bs-parent="#sidebar-nav"> <ul id="incoming-lots-nav" class="nav-content collapse" data-bs-parent="#sidebar-nav">
{% for lot in lots %} {% for lot in lots %}
{% if lot.is_incominig %} {% if lot.is_incoming %}
<li> <li>
<a href="{{ url_for('inventory.devices.lotdevicelist', lot_id=lot.id) }}"> <a href="{{ url_for('inventory.devices.lotdevicelist', lot_id=lot.id) }}">
<i class="bi bi-circle"></i><span>{{ lot.name }}</span> <i class="bi bi-circle"></i><span>{{ lot.name }}</span>

2
ereuse_devicehub/templates/inventory/device_list.html
View file

@ -12,7 +12,7 @@
{% elif lot.is_temporary %} {% elif lot.is_temporary %}
<li class="breadcrumb-item active">Temporary Lot</li> <li class="breadcrumb-item active">Temporary Lot</li>
<li class="breadcrumb-item active">{{ lot.name }}</li> <li class="breadcrumb-item active">{{ lot.name }}</li>
{% elif lot.is_incominig %} {% elif lot.is_incoming %}
<li class="breadcrumb-item active">Incoming Lot</li> <li class="breadcrumb-item active">Incoming Lot</li>
<li class="breadcrumb-item active">{{ lot.name }}</li> <li class="breadcrumb-item active">{{ lot.name }}</li>
{% elif lot.is_outgoing %} {% elif lot.is_outgoing %}