drop commits 04063db 022d40e c8aefc6

ereuse_devicehub/labels/forms.py

@@ -1,6 +1,6 @@
 from flask import g
 from flask_wtf import FlaskForm
-from wtforms import HiddenField, IntegerField, StringField, validators
+from wtforms import IntegerField, StringField, validators
 
 from ereuse_devicehub.db import db
 from ereuse_devicehub.resources.device.models import Device
@@ -48,7 +48,7 @@ class TagUnnamedForm(FlaskForm):
 
 
 class PrintLabelsForm(FlaskForm):
-    devices = HiddenField(render_kw={'class': "devicesList"})
+    devices = StringField(render_kw={'class': "devicesList d-none"})
 
     def validate(self, extra_validators=None):
         is_valid = super().validate(extra_validators)

ereuse_devicehub/static/js/main_inventory.js

@@ -1,5 +1,4 @@
 $(document).ready(function() {
-    $(".deviceSelect").on("change", deviceSelect);
     var show_allocate_form = $("#allocateModal").data('show-action-form');
     var show_datawipe_form = $("#datawipeModal").data('show-action-form');
     var show_trade_form = $("#tradeLotModal").data('show-action-form');
@@ -12,6 +11,8 @@ $(document).ready(function() {
     } else if (show_trade_form != "None") {
         $("#tradeLotModal .btn-primary").show();
         newTrade(show_trade_form);
+    } else {
+        $(".deviceSelect").on("change", deviceSelect);
     }
     // $('#selectLot').selectpicker();
 })
@@ -180,11 +181,6 @@ function export_file(type_file) {
     }
 }
 
-function print_labels() {
-    deviceSelect();
-    $('#print_labels').submit();
-}
-
 
 /**
  * Reactive lots button

ereuse_devicehub/templates/inventory/device_list.html

@@ -237,7 +237,7 @@
                       {% for f in form_print_labels %}
                         {{ f }}
                       {% endfor %}
-                      <a href="javascript:print_labels()" class="dropdown-item">
+                      <a href="javascript:$('#print_labels').submit()" class="dropdown-item">
                         <i class="bi bi-printer"></i>
                         Print labels
                       </a>