diff --git a/app/routes/assets.py b/app/routes/assets.py index c416646..2a62418 100644 --- a/app/routes/assets.py +++ b/app/routes/assets.py @@ -95,8 +95,9 @@ def create(): return render_template('assets/form.html', asset=None, asset_types=ASSET_TYPES, asset_statuses=ASSET_STATUSES) - service_tag = request.form.get('service_tag', '').strip() or None - if service_tag and Asset.query.filter_by(service_tag=service_tag).first(): + # Service tag mirrors the serial number (same identifier) + service_tag = sn + if Asset.query.filter(Asset.service_tag == service_tag, Asset.serial_number != sn).first(): flash(f'An asset with service tag {service_tag} already exists.', 'danger') return render_template('assets/form.html', asset=None, asset_types=ASSET_TYPES, asset_statuses=ASSET_STATUSES) @@ -223,7 +224,7 @@ def edit(asset_id): asset_types=ASSET_TYPES, asset_statuses=ASSET_STATUSES) asset.serial_number = new_sn - asset.service_tag = request.form.get('service_tag', '').strip() or None + asset.service_tag = new_sn # service tag mirrors serial number asset.asset_tag = request.form.get('asset_tag', '').strip() or None asset.asset_type = request.form.get('asset_type', asset.asset_type) asset.brand = request.form.get('brand', '').strip() or None diff --git a/app/templates/assets/form.html b/app/templates/assets/form.html index a08e7c5..cffe75a 100644 --- a/app/templates/assets/form.html +++ b/app/templates/assets/form.html @@ -23,18 +23,14 @@
Identifiers
-
- +
+ + value="{{ asset.service_tag or asset.serial_number if asset else (prefill.service_tag or prefill.serial_number if prefill else '') }}" + placeholder="e.g. ABC1234" required> +
Used as both the service tag and serial number.
-
- - -
-
+