mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-20 17:15:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show a notice flash to remember user to review changes

Browse source
This commit is contained in:
Jan Böhmer 2023-11-24 19:45:15 +01:00
parent 615defa84a
commit 099ea63740
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Controller/PartController.php
View file

@ -243,6 +243,8 @@ class PartController extends AbstractController
//Save the old name of the target part for the template
$target_name = $target->getName();
$this->addFlash('notice', t('part.merge.flash.please_review'));
$merged = $partMerger->merge($target, $other);
return $this->renderPartForm('merge', $request, $merged, [], [
'tname_before' => $target_name,
@ -265,6 +267,8 @@ class PartController extends AbstractController
$part = $partMerger->merge($part, $provider_part);
$this->addFlash('notice', t('part.merge.flash.please_review'));
return $this->renderPartForm('update_from_ip', $request, $part, [
'info_provider_dto' => $dto,
], [

6
translations/messages.en.xlf
View file

@ -12035,5 +12035,11 @@ Please note, that you can not impersonate a disabled user. If you try you will g
<target>Update existing part from info provider</target>
</segment>
</unit>
<unit id="lkIVIWr" name="part.merge.flash.please_review">
<segment>
<source>part.merge.flash.please_review</source>
<target>Data not saved yet. Review the changes and click save to persist the new data.</target>
</segment>
</unit>
</file>
</xliff>