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

Merge branch 'testing' into feature/3598-binding

Browse source
This commit is contained in:
Cayo Puigdefabregas 2022-07-21 16:46:22 +02:00
parent 60e46fae7b 9f0edf5bd8
commit 21dcb6c26d
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -10,6 +10,7 @@ ml).
- [fixed] #313 Bump numpy from 1.21.6 to 1.22.0. - [fixed] #313 Bump numpy from 1.21.6 to 1.22.0.
- [fixed] #314 bugs create placeholder from lot. - [fixed] #314 bugs create placeholder from lot.
- [fixed] #317 bugs about exports placeholders. - [fixed] #317 bugs about exports placeholders.
- [fixed] #318 bugs about unlink tag of device.
## [2.3.0] - 2022-07-12 ## [2.3.0] - 2022-07-12
- [added] #281 Add selenium test. - [added] #281 Add selenium test.

4
ereuse_devicehub/static/js/main_inventory.build.js
View file

@ -216,7 +216,7 @@ function removeLot() {
function removeTag() { function removeTag() {
const devices = TableController.getSelectedDevices(); const devices = TableController.getSelectedDevices();
const devices_id = devices.map(dev => dev.data); const devices_id = devices.map(dev => $(dev).attr('data'));
if (devices_id.length == 1) { if (devices_id.length == 1) {
const url = "/inventory/tag/devices/".concat(devices_id[0], "/del/"); const url = "/inventory/tag/devices/".concat(devices_id[0], "/del/");
@ -228,7 +228,7 @@ function removeTag() {
function addTag() { function addTag() {
const devices = TableController.getSelectedDevices(); const devices = TableController.getSelectedDevices();
const devices_id = devices.map(dev => dev.data); const devices_id = devices.map(dev => $(dev).attr('data'));
if (devices_id.length == 1) { if (devices_id.length == 1) {
$("#addingTagModal .pol").hide(); $("#addingTagModal .pol").hide();

4
ereuse_devicehub/static/js/main_inventory.js
View file

@ -207,7 +207,7 @@ function removeLot() {
function removeTag() { function removeTag() {
const devices = TableController.getSelectedDevices(); const devices = TableController.getSelectedDevices();
const devices_id = devices.map(dev => dev.data); const devices_id = devices.map(dev => $(dev).attr("data"));
if (devices_id.length == 1) { if (devices_id.length == 1) {
const url = `/inventory/tag/devices/${devices_id[0]}/del/`; const url = `/inventory/tag/devices/${devices_id[0]}/del/`;
window.location.href = url; window.location.href = url;
@ -218,7 +218,7 @@ function removeTag() {
function addTag() { function addTag() {
const devices = TableController.getSelectedDevices(); const devices = TableController.getSelectedDevices();
const devices_id = devices.map(dev => dev.data); const devices_id = devices.map(dev => $(dev).attr("data"));
if (devices_id.length == 1) { if (devices_id.length == 1) {
$("#addingTagModal .pol").hide(); $("#addingTagModal .pol").hide();
$("#addingTagModal .btn-primary").show(); $("#addingTagModal .btn-primary").show();