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

put the old dhid in the new placeholder device

This commit is contained in:
Cayo Puigdefabregas 2022-08-10 18:05:18 +02:00
parent f3766e49a8
commit f55abc4a7b
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ereuse_devicehub/migrations/versions/d7ea9a3b2da1_create_placeholders.py
View File

@ -63,6 +63,9 @@ def clone_device(device):
if device.type == "Battery": if device.type == "Battery":
device.size device.size
old_devicehub_id = device.devicehub_id
dict_device = copy.copy(device.__dict__) dict_device = copy.copy(device.__dict__)
dict_device.pop('_sa_instance_state') dict_device.pop('_sa_instance_state')
dict_device.pop('id', None) dict_device.pop('id', None)
@ -73,6 +76,8 @@ def clone_device(device):
dict_device.pop('tags', None) dict_device.pop('tags', None)
dict_device.pop('system_uuid', None) dict_device.pop('system_uuid', None)
new_device = device.__class__(**dict_device) new_device = device.__class__(**dict_device)
new_device.devicehub_id = old_devicehub_id
device.devicehub_id = None
db.session.add(new_device) db.session.add(new_device)
if hasattr(device, 'components'): if hasattr(device, 'components'):

2
ereuse_devicehub/resources/documents/device_row.py
View File

@ -276,7 +276,7 @@ class DeviceRow(BaseDeviceRow):
software=snapshot.software.name, version=snapshot.version software=snapshot.software.name, version=snapshot.version
) )
# General information about device # General information about device
self['DHID'] = device.devicehub_id self['DHID'] = self.placeholder.device.devicehub_id
self['DocumentID'] = self.document_id self['DocumentID'] = self.document_id
self['Public Link'] = '{url}{id}'.format( self['Public Link'] = '{url}{id}'.format(
url=url_for('Device.main', _external=True), id=device.devicehub_id url=url_for('Device.main', _external=True), id=device.devicehub_id

2
ereuse_devicehub/templates/inventory/device_detail.html
View File

@ -34,7 +34,7 @@
{% if placeholder.binding %} {% if placeholder.binding %}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{ url_for('inventory.device_details', id=placeholder.binding.devicehub_id) }}">Workbench device</a> <a class="nav-link" href="{# url_for('inventory.device_details', id=placeholder.binding.devicehub_id) #}">Workbench device</a>
</li> </li>
{% endif %} {% endif %}