From cf299a3d0b67fbfacab0133179ef7525869b99f3 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Mon, 21 Dec 2020 19:16:14 +0100
Subject: [PATCH] Optimized file save/delete handling

---
 localization/strings.pot          | 5 +----
 public/viewjs/equipmentform.js    | 2 ++
 views/equipmentform.blade.php     | 5 +----
 views/shoppinglocations.blade.php | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/localization/strings.pot b/localization/strings.pot
index 408a527d..e9af4110 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -769,10 +769,7 @@ msgstr ""
 msgid "Create equipment"
 msgstr ""
 
-msgid "No instruction manual available"
-msgstr ""
-
-msgid "The current instruction manual will be deleted when you save the equipment"
+msgid "The current file will be deleted on save"
 msgstr ""
 
 msgid "No picture available"
diff --git a/public/viewjs/equipmentform.js b/public/viewjs/equipmentform.js
index 2de8b8aa..ab68af9b 100644
--- a/public/viewjs/equipmentform.js
+++ b/public/viewjs/equipmentform.js
@@ -131,6 +131,8 @@ $('#delete-current-instruction-manual-button').on('click', function(e)
 	$("#current-equipment-instruction-manual").addClass("d-none");
 	$("#delete-current-instruction-manual-on-save-hint").removeClass("d-none");
 	$("#delete-current-instruction-manual-button").addClass("disabled");
+	$("#instruction-manual-label").addClass("d-none");
+	$("#instruction-manual-label-none").removeClass("d-none");
 });
 ResizeResponsiveEmbeds();
 
diff --git a/views/equipmentform.blade.php b/views/equipmentform.blade.php
index 3103bc84..522cf8b1 100644
--- a/views/equipmentform.blade.php
+++ b/views/equipmentform.blade.php
@@ -105,10 +105,7 @@
 					src="{{ $U('/api/files/equipmentmanuals/' . base64_encode($equipment->instruction_manual_file_name)) }}"
 					type="application/pdf">
 				<p id="delete-current-instruction-manual-on-save-hint"
-					class="form-text text-muted font-italic d-none">{{ $__t('The current instruction manual will be deleted when you save the equipment') }}</p>
-				@else
-				<p id="no-current-instruction-manual-hint"
-					class="form-text text-muted font-italic">{{ $__t('No instruction manual available') }}</p>
+					class="form-text text-muted font-italic d-none">{{ $__t('The current file will be deleted on save') }}</p>
 				@endif
 			</div>
 		</div>
diff --git a/views/shoppinglocations.blade.php b/views/shoppinglocations.blade.php
index 072a317f..6306f565 100644
--- a/views/shoppinglocations.blade.php
+++ b/views/shoppinglocations.blade.php
@@ -30,7 +30,7 @@
 					{{ $__t('Add') }}
 				</a>
 				<a class="btn btn-outline-secondary m-1 mt-md-0 mb-md-0 float-right"
-					href="{{ $U('/userfields?entity=shoppinglocations') }}">
+					href="{{ $U('/userfields?entity=shopping_locations') }}">
 					{{ $__t('Configure userfields') }}
 				</a>
 			</div>