mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-21 09:35:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only do the german->english footprint conversion if the footprint contains german text

Browse source 
Otherwise this had broken the viewing of passive components.
This commit is contained in:
Jan Böhmer 2023-01-09 23:05:36 +01:00
parent ddd8a66024
commit 0b519c2b7f
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Services/Attachments/AttachmentPathResolver.php
View file

@ -366,6 +366,11 @@ class AttachmentPathResolver
public function convertOldFootprintPath(string $old_path): string public function convertOldFootprintPath(string $old_path): string
{ {
//Only do the conversion if it contains a german string (meaning it has one of the four former base folders in its path)
if (!preg_match('/%FOOTPRINTS%\/(Passiv|Aktiv|Akustik|Elektromechanik|Optik)\//', $old_path)) {
return $old_path;
}
return strtr($old_path, self::OLD_FOOTPINT_PATH_REPLACEMENT); return strtr($old_path, self::OLD_FOOTPINT_PATH_REPLACEMENT);
} }
} }

3
tests/Services/Attachments/AttachmentPathResolverTest.php
View file

@ -154,6 +154,9 @@ class AttachmentPathResolverTest extends WebTestCase
yield [$this->footprint_path . '/Active/ICs/TO/IC_TO126.png', '%FOOTPRINTS%/Aktiv/ICs/TO/IC_TO126.png']; yield [$this->footprint_path . '/Active/ICs/TO/IC_TO126.png', '%FOOTPRINTS%/Aktiv/ICs/TO/IC_TO126.png'];
yield [$this->footprint_path . '/Electromechanics/Switches_Buttons/RotarySwitches/ROTARY_SWITCH_DIP10.png', '%FOOTPRINTS%/Elektromechanik/Schalter_Taster/Drehschalter/DREHSCHALTER_DIP10.png']; yield [$this->footprint_path . '/Electromechanics/Switches_Buttons/RotarySwitches/ROTARY_SWITCH_DIP10.png', '%FOOTPRINTS%/Elektromechanik/Schalter_Taster/Drehschalter/DREHSCHALTER_DIP10.png'];
yield [$this->footprint_path . '/Electromechanics/Connectors/DINConnectors/SOCKET_DIN_MAB_4.png', '%FOOTPRINTS%/Elektromechanik/Verbinder/Rundsteckverbinder/BUCHSE_DIN_MAB_4.png']; yield [$this->footprint_path . '/Electromechanics/Connectors/DINConnectors/SOCKET_DIN_MAB_4.png', '%FOOTPRINTS%/Elektromechanik/Verbinder/Rundsteckverbinder/BUCHSE_DIN_MAB_4.png'];
//Leave english pathes untouched
yield [$this->footprint_path . '/Passive/Capacitors/CAPACITOR_CTS_A_15MM.png', '%FOOTPRINTS%/Passive/Capacitors/CAPACITOR_CTS_A_15MM.png'];
} }
/** /**