Skip to content

Commit

Permalink
Merge pull request #1967 from scireum/feature/mbo/SIRI-950
Browse files Browse the repository at this point in the history
Implements entityId to t:tracing for copying entity ids more easily
  • Loading branch information
scireum-mbo authored Apr 8, 2024
2 parents 22fa3cb + 79b8ff9 commit 4089f84
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/main/resources/biz_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -672,11 +672,11 @@ MongoCodeListImportJobFactory.description = Importiert eine Codeliste aus einer
MongoCodeListImportJobFactory.label = Codeliste importieren
MongoCustomScript.code = Code
MongoCustomScript.disabled = Deaktiviert
MongoCustomScript.plural = Kunden-Scripte
MongoCustomScript.script = Quelltext
MongoCustomScript.state = Status
MongoCustomScript.state.active = Aktiv
MongoCustomScript.state.inactive = Inaktiv
MongoCustomScript.plural = Kunden-Scripte
MongoCustomScript.script = Quelltext
MongoCustomScript.unnamedScript = Unbenanntes Script
MongoTenantExportJobFactory.description = Exportiert Mandanten in eine CSV oder Excel Datei.
MongoTenantExportJobFactory.label = Mandanten exportieren
Expand Down Expand Up @@ -757,9 +757,9 @@ Parameter.required = Der Parameter ${name} muss gefüllt sein.
PerformanceData.flags = Flags
PerformanceFlag.academy-user = Nutzt Video-Academy
PerformanceFlag.academy-users = Nutzt Video-Academy
PerformanceFlag.custom-scripts = Nutzt Kunden-Scripting
PerformanceFlag.active-user = Aktiv
PerformanceFlag.active-users = Hat aktive Nutzer
PerformanceFlag.custom-scripts = Nutzt Kunden-Scripting
PerformanceFlag.frequent-user = Regelmäßig Aktiv
Permission.administrator = Administrator
Permission.administrator.description = Ermöglicht dem Anwender Systemeinstellungen abzuändern.
Expand Down Expand Up @@ -1042,6 +1042,7 @@ TraceData.changedBy = Letzte Änderung durch
TraceData.created = Erstellt
TraceData.createdAt = Erstellt am
TraceData.createdBy = Erstellt von
TraceData.entity = Entity-ID
TraceData.infos = Informationen
TransferFilesJob.description = Verschiebt oder kopiert eine oder mehrere Dateien oder Verzeichnisse.
TransferFilesJob.destination = Ziel
Expand Down
18 changes: 18 additions & 0 deletions src/main/resources/default/taglib/t/tracing.html.pasta
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<i:arg name="trace" type="sirius.biz.protocol.TraceData"/>
<i:arg name="journal" type="sirius.biz.protocol.JournalData" default=""/>
<i:arg name="transactionData" type="sirius.biz.importer.txn.ImportTransactionData" default=""/>
<i:arg name="entityId" type="String" default=""/>
<i:pragma name="inline" value="true"/>
<i:pragma name="description" value="Renders a trace button and the trace information for a TracedEntity"/>

Expand Down Expand Up @@ -33,6 +34,23 @@
<div class="text-muted">@trace.getChangedIn()</div>
</t:infoLine>
</div>

<i:if test="isFilled(entityId)">
<div class="col-md-12">
<p>
@i18n('TraceData.entity')
</p>
<t:textfield name="copyEntityId"
class="col-md-4"
id="copyEntityId"
value="@entityId"
readonly="true">
<i:block name="addon">
<t:copyToClipboardAddon fieldName="copyEntityId"/>
</i:block>
</t:textfield>
</div>
</i:if>
</div>

<i:if test="transactionData != null">
Expand Down

0 comments on commit 4089f84

Please sign in to comment.