diff --git a/VERSION b/VERSION index 15b989e3..41c11ffb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.16.0 +1.16.1 diff --git a/docs/installation/installation_docker.md b/docs/installation/installation_docker.md index 5d357ae5..cb24e6c1 100644 --- a/docs/installation/installation_docker.md +++ b/docs/installation/installation_docker.md @@ -201,6 +201,10 @@ You also have to create the database as described above in step 4. You can run the console commands described in README by executing `docker exec --user=www-data -it partdb bin/console [command]` +{: .warning } +> If you run a root console inside the container, and wanna execute commands on the webserver behalf, be sure to use `sudo -E` command (with the `-E` flag) to preserve env variables from the current shell. +> Otherwise Part-DB console might use the wrong configuration to execute commands. + ## Troubleshooting *Login is not possible. Login page is just reloading and no error message is shown or something like "CSFR token invalid"*: diff --git a/docs/usage/console_commands.md b/docs/usage/console_commands.md index 00431a34..d23f10c4 100644 --- a/docs/usage/console_commands.md +++ b/docs/usage/console_commands.md @@ -25,6 +25,12 @@ is named `partdb`, you can execute the command `php bin/console cache:clear` wit docker exec --user=www-data partdb php bin/console cache:clear ``` +{: .warning } +> If you run a root console inside the docker container, and wanna execute commands on the webserver behalf, be sure to use `sudo -E` command (with the `-E` flag) to preserve env variables from the current shell. +> Otherwise Part-DB console might use the wrong configuration to execute commands. + +## Troubleshooting + ## User management commands * `php bin/console partdb:users:list`: List all users of this Part-DB instance @@ -64,4 +70,4 @@ docker exec --user=www-data partdb php bin/console cache:clear ## Database commands * `php bin/console doctrine:migrations:migrate`: Migrate the database to the latest version -* `php bin/console doctrine:migrations:up-to-date`: Check if the database is up-to-date \ No newline at end of file +* `php bin/console doctrine:migrations:up-to-date`: Check if the database is up-to-date diff --git a/migrations/Version20250220215048.php b/migrations/Version20250220215048.php index fd4fb9c2..debab1b8 100644 --- a/migrations/Version20250220215048.php +++ b/migrations/Version20250220215048.php @@ -4,20 +4,21 @@ declare(strict_types=1); namespace DoctrineMigrations; -use App\Migration\AbstractMultiPlatformMigration; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Migrations\AbstractMigration; -final class Version20250220215048 extends AbstractMultiPlatformMigration +final class Version20250220215048 extends AbstractMigration { public function getDescription(): string { return 'Split $path property for attachments into $internal_path and $external_path'; } - public function mySQLUp(Schema $schema): void + public function up(Schema $schema): void { //Create the new columns as nullable (that is easier modifying them) - $this->addSql('ALTER TABLE attachments ADD internal_path VARCHAR(255) DEFAULT NULL, ADD external_path VARCHAR(255) DEFAULT NULL'); + $this->addSql('ALTER TABLE attachments ADD internal_path VARCHAR(255) DEFAULT NULL'); + $this->addSql('ALTER TABLE attachments ADD external_path VARCHAR(255) DEFAULT NULL'); //Copy the data from path to external_path and remove the path column $this->addSql('UPDATE attachments SET external_path=path'); @@ -32,52 +33,10 @@ final class Version20250220215048 extends AbstractMultiPlatformMigration $this->addSql('UPDATE attachments SET external_path=NULL WHERE internal_path IS NOT NULL'); } - public function mySQLDown(Schema $schema): void + public function down(Schema $schema): void { $this->addSql('UPDATE attachments SET external_path=internal_path WHERE internal_path IS NOT NULL'); $this->addSql('ALTER TABLE attachments DROP internal_path'); $this->addSql('ALTER TABLE attachments RENAME COLUMN external_path TO path'); } - - public function postgreSQLUp(Schema $schema): void - { - //We can use the same SQL for PostgreSQL as for MySQL - $this->mySQLUp($schema); - } - - public function postgreSQLDown(Schema $schema): void - { - //We can use the same SQL for PostgreSQL as for MySQL - $this->mySQLDown($schema); - } - - public function sqLiteUp(Schema $schema): void - { - $this->addSql('CREATE TEMPORARY TABLE __temp__attachments AS SELECT id, type_id, original_filename, show_in_table, name, last_modified, datetime_added, class_name, element_id, path FROM attachments'); - $this->addSql('DROP TABLE attachments'); - $this->addSql('CREATE TABLE attachments (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, type_id INTEGER NOT NULL, original_filename VARCHAR(255) DEFAULT NULL, show_in_table BOOLEAN NOT NULL, name VARCHAR(255) NOT NULL, last_modified DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, datetime_added DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, class_name VARCHAR(255) NOT NULL, element_id INTEGER NOT NULL, internal_path VARCHAR(255) DEFAULT NULL, external_path VARCHAR(255) DEFAULT NULL, CONSTRAINT FK_47C4FAD6C54C8C93 FOREIGN KEY (type_id) REFERENCES attachment_types (id) ON UPDATE NO ACTION ON DELETE NO ACTION NOT DEFERRABLE INITIALLY IMMEDIATE)'); - $this->addSql('INSERT INTO attachments (id, type_id, original_filename, show_in_table, name, last_modified, datetime_added, class_name, element_id, external_path) SELECT id, type_id, original_filename, show_in_table, name, last_modified, datetime_added, class_name, element_id, path FROM __temp__attachments'); - $this->addSql('DROP TABLE __temp__attachments'); - $this->addSql('CREATE INDEX attachment_element_idx ON attachments (class_name, element_id)'); - $this->addSql('CREATE INDEX attachment_name_idx ON attachments (name)'); - $this->addSql('CREATE INDEX attachments_idx_class_name_id ON attachments (class_name, id)'); - $this->addSql('CREATE INDEX attachments_idx_id_element_id_class_name ON attachments (id, element_id, class_name)'); - $this->addSql('CREATE INDEX IDX_47C4FAD6C54C8C93 ON attachments (type_id)'); - $this->addSql('CREATE INDEX IDX_47C4FAD61F1F2A24 ON attachments (element_id)'); - - $this->addSql('UPDATE attachments SET internal_path=external_path WHERE external_path LIKE \'#%MEDIA#%%\' ESCAPE \'#\''); - $this->addSql('UPDATE attachments SET internal_path=external_path WHERE external_path LIKE \'#%BASE#%%\' ESCAPE \'#\''); - $this->addSql('UPDATE attachments SET internal_path=external_path WHERE external_path LIKE \'#%SECURE#%%\' ESCAPE \'#\''); - $this->addSql('UPDATE attachments SET internal_path=external_path WHERE external_path LIKE \'#%FOOTPRINTS#%%\' ESCAPE \'#\''); - $this->addSql('UPDATE attachments SET internal_path=external_path WHERE external_path LIKE \'#%FOOTPRINTS3D#%%\' ESCAPE \'#\''); - $this->addSql('UPDATE attachments SET external_path=NULL WHERE internal_path IS NOT NULL'); - } - - public function sqLiteDown(Schema $schema): void - { - //Reuse the MySQL down migration: - $this->mySQLDown($schema); - } - - } diff --git a/src/Services/InfoProviderSystem/Providers/LCSCProvider.php b/src/Services/InfoProviderSystem/Providers/LCSCProvider.php index 375c6f4d..d903a8dd 100755 --- a/src/Services/InfoProviderSystem/Providers/LCSCProvider.php +++ b/src/Services/InfoProviderSystem/Providers/LCSCProvider.php @@ -76,7 +76,7 @@ class LCSCProvider implements InfoProviderInterface 'Cookie' => new Cookie('currencyCode', $this->currency) ], 'query' => [ - 'prductCode' => $id, + 'productCode' => $id, ], ]); diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf index 276c49f4..304062bc 100644 --- a/translations/messages.en.xlf +++ b/translations/messages.en.xlf @@ -9304,7 +9304,7 @@ Element 3 part.filter.orderdetails_count - Number of orderdetails + Number of order details diff --git a/translations/messages.it.xlf b/translations/messages.it.xlf index 4a4659f2..65e543d5 100644 --- a/translations/messages.it.xlf +++ b/translations/messages.it.xlf @@ -780,18 +780,10 @@ L'utente dovrà configurare nuovamente tutti i metodi di autenticazione a due fa Eliminare - - - Part-DB1\templates\AdminPages\_attachments.html.twig:41 - Part-DB1\templates\Parts\edit\_attachments.html.twig:38 - Part-DB1\templates\Parts\info\_attachments_info.html.twig:35 - Part-DB1\src\DataTables\AttachmentDataTable.php:159 - Part-DB1\templates\Parts\edit\_attachments.html.twig:38 - Part-DB1\src\DataTables\AttachmentDataTable.php:159 - + - attachment.external - Esterno + attachment.external_only + Solo allegato esterno @@ -806,7 +798,7 @@ L'utente dovrà configurare nuovamente tutti i metodi di autenticazione a due fa Miniatura dell'allegato - + Part-DB1\templates\AdminPages\_attachments.html.twig:52 Part-DB1\templates\Parts\edit\_attachments.html.twig:50 @@ -816,8 +808,8 @@ L'utente dovrà configurare nuovamente tutti i metodi di autenticazione a due fa Part-DB1\templates\Parts\info\_attachments_info.html.twig:45 - attachment.view - Visualizzare + attachment.view_local + Visualizza la copia locale @@ -2119,14 +2111,14 @@ I sub elementi saranno spostati verso l'alto. Immagine di anteprima - + Part-DB1\templates\Parts\info\_attachments_info.html.twig:67 Part-DB1\templates\Parts\info\_attachments_info.html.twig:50 - attachment.download - Download + attachment.download_local + Scarica la copia in locale @@ -12324,5 +12316,35 @@ Notare che non è possibile impersonare un utente disattivato. Quando si prova a Profilo salvato! + + + entity.export.flash.error.no_entities + Non ci sono entità da esportare! + + + + + attachment.table.internal_file + File interno + + + + + attachment.table.external_link + Link esterno + + + + + attachment.view_external.view_at + Visualizza da %host% + + + + + attachment.view_external + Visualizza la versione esterna + + diff --git a/translations/security.zh.xlf b/translations/security.zh.xlf index 61b236ae..58fbb26f 100644 --- a/translations/security.zh.xlf +++ b/translations/security.zh.xlf @@ -1,17 +1,23 @@ - + user.login_error.user_disabled 账户已被禁用。请联系管理员 - + saml.error.cannot_login_local_user_per_saml 无法通过 SSO 以本地用户身份登录。请使用本地用户密码 + + + saml.error.cannot_login_saml_user_locally + 无法使用本地身份验证器以SAML用户身份登录！请改用SSO登录 + +