Changes to fix the Barcode Search

Web/app.py

@@ -4498,17 +4498,25 @@ def api_item_detail(item_id):
         else:
             status_label = 'Verfügbar'
 
+        # Helper function to get borrower display name
+        def get_borrower_name(user_raw):
+            if not user_raw:
+                return ''
+            try:
+                user_doc = student_cards_col.find_one({'_id': ObjectId(user_raw)})
+                if user_doc:
+                    if user_doc.get('SchülerName'):
+                        return decrypt_text(str(user_doc.get('SchülerName', '')))
+                    return str(user_doc.get('AusweisId', ''))
+            except Exception:
+                pass
+            return str(user_raw)
+
         # Prefer the most recent active borrower across the group
         borrower_value = ''
         for rec in borrow_records:
             if rec.get('Status') == 'active' and rec.get('User'):
-                try:
-                    user_raw = rec.get('User')
-                    user_doc = student_cards_col.find_one({'_id': ObjectId(user_raw)}) if user_raw else None
-                    if user_doc:
-                        borrower_value = decrypt_text(str(user_doc.get('SchülerName', ''))) if user_doc.get('SchülerName') else str(user_doc.get('AusweisId', ''))
-                except Exception:
-                    borrower_value = str(rec.get('User', ''))
+                borrower_value = get_borrower_name(rec.get('User'))
                 break
         
         if not borrower_value and item.get('User'):
@@ -4531,22 +4539,13 @@ def api_item_detail(item_id):
             rows = []
             
             for rec in borrow_records[:3]:
-                user_raw = rec.get('User')
-                app.logger.debug(f"Processing borrow record: {rec}")
-                user_doc = student_cards_col.find_one({'_id': ObjectId(user_raw)}) if user_raw else None
-                app.logger.debug(f"Found user_doc: {user_doc}")
-                if user_doc:
-                    borrower_value = decrypt_text(str(user_doc.get('SchülerName', ''))) if user_doc.get('SchülerName') else str(user_doc.get('AusweisId', ''))
-                try:
-                    user = user_doc if user_doc is not None else ''
-                except Exception:
-                    user = user_doc
+                rec_borrower_name = get_borrower_name(rec.get('User')) or '-'
                 status = rec.get('Status', '')
                 start = fmt_dt(rec.get('Start'))
                 end = fmt_dt(rec.get('End'))
                 notes = html.escape(str(rec.get('Notes') or ''))
                 rows.append(
-                    f"<li><strong>{html.escape(str(user or '-'))}</strong> — "
+                    f"<li><strong>{html.escape(rec_borrower_name)}</strong> — "
                     f"{html.escape(str(status))} — "
                     f"{html.escape(str(start))} → {html.escape(str(end))}"
                     f"{(' — ' + notes) if notes else ''}</li>"

Web/templates/main_admin.html

@@ -3368,10 +3368,11 @@ document.addEventListener('DOMContentLoaded', ()=>{
 
     function loadItems(offset = 0, append = false, searchTerm = '', searchScope = 'all') {
         // Keep list payload lightweight; full details are fetched on-demand in openItemQuick.
-        const searchParams = searchTerm
+        const searchParams = searchTerm && searchScope === 'title_description'
             ? `&search=${encodeURIComponent(searchTerm)}&search_scope=${encodeURIComponent(searchScope)}`
             : '';
-        return fetch(`{{ url_for('get_items') }}?offset=${offset}&limit=${MAIN_ADMIN_ITEMS_PAGE_SIZE}&light_mode=true${searchParams}`)
+        const limit = (searchTerm && searchScope === 'all') ? 5000 : MAIN_ADMIN_ITEMS_PAGE_SIZE;
+        return fetch(`{{ url_for('get_items') }}?offset=${offset}&limit=${limit}&light_mode=true${searchParams}`)
             .then(response => response.json())
             .then(data => {
                 const itemsContainer = document.querySelector('#items-container');
@@ -3390,8 +3391,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
                 if (!append && (!pageItems || pageItems.length === 0)) {
                     itemsContainer.innerHTML = `
                         <div class="no-items-message">
-                            <div>Keine Objekte gefunden</div>
-                            <a class="empty-state-cta" href="{{ url_for('upload_admin') }}">Erstellen sie hier ihr erstes Item</a>
+                            <div>Kein Item gefunden</div>
                         </div>
                     `;
                     if (itemsIndicator) {