Compare commits

...

2 Commits

3 changed files with 19 additions and 14 deletions
+8 -8
View File
@@ -218,14 +218,14 @@ jobs:
INVENTAR_MONGODB_DB: Inventarsystem
INVENTAR_BACKUP_FOLDER: /data/backups
INVENTAR_LOGS_FOLDER: /data/logs
INVENTAR_SECRET_KEY: \${INVENTAR_SECRET_KEY}
INVENTAR_DATA_ENCRYPTION_KEY: \${INVENTAR_DATA_ENCRYPTION_KEY}
INVENTAR_MONGODB_PASSWORD: \${INVENTAR_MONGODB_PASSWORD}
EMAIL_ENABLED: \${EMAIL_ENABLED}
EMAIL_SMTP_HOST: \${EMAIL_SMTP_HOST}
EMAIL_SMTP_PORT: \${EMAIL_SMTP_PORT}
EMAIL_USERNAME: \${EMAIL_USERNAME}
EMAIL_PASSWORD: \${EMAIL_PASSWORD}
INVENTAR_SECRET_KEY: \${secrets.INVENTAR_SECRET_KEY}
INVENTAR_DATA_ENCRYPTION_KEY: \${{secrets.INVENTAR_DATA_ENCRYPTION_KEY}}
INVENTAR_MONGODB_PASSWORD: \${{secrets.INVENTAR_MONGODB_PASSWORD}}
EMAIL_ENABLED: \${{secrets.EMAIL_ENABLED}}
EMAIL_SMTP_HOST: \${{secrets.EMAIL_SMTP_HOST}}
EMAIL_SMTP_PORT: \${{secrets.EMAIL_SMTP_PORT}}
EMAIL_USERNAME: \${{secrets.EMAIL_USERNAME}}
EMAIL_PASSWORD: \${{secrets.EMAIL_PASSWORD}}
expose:
- "8000"
volumes:
+6 -2
View File
@@ -1824,9 +1824,9 @@ def _excel_list(value):
seen = set()
unique = []
for entry in cleaned:
if entry not in seen:
if str(entry) not in seen:
unique.append(entry)
seen.add(entry)
seen.add(str(entry))
return unique
@@ -6737,6 +6737,8 @@ def update_group():
{'$set': shared_update}
)
app.logger.debug(f"Individual Codes: {individual_items}")
# B. Apply Unique Codes to specific items
# We iterate through the provided list to update the specific code for each ID
for item in individual_items:
@@ -6750,6 +6752,8 @@ def update_group():
)
client.close()
app.logger.debug("Success When Updating the Item")
flash("Objekte wurden erfolgreich Bearbeitet", "success")
return jsonify({'success': True, 'message': 'Gruppe und individuelle Codes aktualisiert'})
except Exception as e:
+5 -4
View File
@@ -1371,7 +1371,8 @@
await loadLibraryItems(); // Daten neu laden
// renderTable(); // Ggf. Tabelle neu rendern
} else {
alert('Fehler: ' + result.message);
closeEditLibraryModal();
await loadLibraryItems();
}
} catch (error) {
console.error('Update failed:', error);
@@ -1451,14 +1452,14 @@
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px; border-bottom: 1px solid #eee; padding-bottom: 10px;">
<strong style="color: #0ea5e9;">Gruppen-Range (Total: <span id="editLibraryGroupCount"></span>)</strong>
</div>
<p style="margin: 5px 0; font-size: 12px; color: #555;">
Alle Codes in dieser Gruppe:
</p>
<!-- Hier wird die Liste als Komma-Text eingefügt -->
<div id="editLibraryAllCodes" style="font-family: monospace; font-size: 14px; font-weight: bold; color: #333; margin-top: 5px;"></div>
<div style="margin-top: 15px; font-size: 11px; background: #e0f2fe; padding: 8px; border-radius: 4px;">
<strong>Hinweis:</strong> Änderungen an Titel/Ort/Beschreibung werden auf <strong>alle</strong> Exemplare der Range übertragen.
</div>