mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-04-21 05:49:35 +00:00
Compare commits
2 commits
c44535990b
...
00a74ed96a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
00a74ed96a | ||
|
|
699a5c935f |
7 changed files with 34 additions and 5 deletions
|
|
@ -47,6 +47,7 @@
|
||||||
PassEnv PROVIDER_REICHELT_ENABLED PROVIDER_REICHELT_CURRENCY PROVIDER_REICHELT_COUNTRY PROVIDER_REICHELT_LANGUAGE PROVIDER_REICHELT_INCLUDE_VAT
|
PassEnv PROVIDER_REICHELT_ENABLED PROVIDER_REICHELT_CURRENCY PROVIDER_REICHELT_COUNTRY PROVIDER_REICHELT_LANGUAGE PROVIDER_REICHELT_INCLUDE_VAT
|
||||||
PassEnv PROVIDER_POLLIN_ENABLED
|
PassEnv PROVIDER_POLLIN_ENABLED
|
||||||
PassEnv EDA_KICAD_CATEGORY_DEPTH
|
PassEnv EDA_KICAD_CATEGORY_DEPTH
|
||||||
|
PassEnv SHOW_PART_IMAGE_OVERLAY
|
||||||
|
|
||||||
# For most configuration files from conf-available/, which are
|
# For most configuration files from conf-available/, which are
|
||||||
# enabled or disabled at a global level, it is possible to
|
# enabled or disabled at a global level, it is possible to
|
||||||
|
|
|
||||||
3
.env
3
.env
|
|
@ -305,6 +305,9 @@ FIXER_API_KEY=CHANGEME
|
||||||
# When this is empty the content of config/banner.md is used as banner
|
# When this is empty the content of config/banner.md is used as banner
|
||||||
BANNER=""
|
BANNER=""
|
||||||
|
|
||||||
|
# Enable the part image overlay which shows name and filename of the picture
|
||||||
|
SHOW_PART_IMAGE_OVERLAY=1
|
||||||
|
|
||||||
APP_ENV=prod
|
APP_ENV=prod
|
||||||
APP_SECRET=a03498528f5a5fc089273ec9ae5b2849
|
APP_SECRET=a03498528f5a5fc089273ec9ae5b2849
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ twig:
|
||||||
available_themes: '%partdb.available_themes%'
|
available_themes: '%partdb.available_themes%'
|
||||||
saml_enabled: '%partdb.saml.enabled%'
|
saml_enabled: '%partdb.saml.enabled%'
|
||||||
part_preview_generator: '@App\Services\Attachments\PartPreviewGenerator'
|
part_preview_generator: '@App\Services\Attachments\PartPreviewGenerator'
|
||||||
|
img_overlay: '%partdb.show_part_image_overlay%'
|
||||||
|
|
||||||
when@test:
|
when@test:
|
||||||
twig:
|
twig:
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,7 @@ parameters:
|
||||||
# Miscellaneous
|
# Miscellaneous
|
||||||
######################################################################################################################
|
######################################################################################################################
|
||||||
partdb.demo_mode: '%env(bool:DEMO_MODE)%' # If set to true, all potentially dangerous things are disabled (like changing passwords of the own user)
|
partdb.demo_mode: '%env(bool:DEMO_MODE)%' # If set to true, all potentially dangerous things are disabled (like changing passwords of the own user)
|
||||||
|
partdb.show_part_image_overlay: '%env(bool:SHOW_PART_IMAGE_OVERLAY)%' # If set to false, the filename overlay of the part image will be disabled
|
||||||
|
|
||||||
# Set the themes from which the user can choose from in the settings.
|
# Set the themes from which the user can choose from in the settings.
|
||||||
# Themes commented here by default, are not really usable, because of display problems. Enable them at your own risk!
|
# Themes commented here by default, are not really usable, because of display problems. Enable them at your own risk!
|
||||||
|
|
|
||||||
|
|
@ -95,6 +95,8 @@ bundled with Part-DB. Set `DATABASE_MYSQL_SSL_VERIFY_CERT` if you want to accept
|
||||||
particularly for securing and protecting various aspects of your application. It's a secret key that is used for
|
particularly for securing and protecting various aspects of your application. It's a secret key that is used for
|
||||||
cryptographic operations and security measures (session management, CSRF protection, etc..). Therefore this
|
cryptographic operations and security measures (session management, CSRF protection, etc..). Therefore this
|
||||||
value should be handled as confidential data and not shared publicly.
|
value should be handled as confidential data and not shared publicly.
|
||||||
|
* `SHOW_PART_IMAGE_OVERLAY`: Set to 0 to disable the part image overlay, which appears if you hover over an image in the
|
||||||
|
part image gallery
|
||||||
|
|
||||||
### E-Mail settings
|
### E-Mail settings
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,8 @@ class TreeViewGenerator
|
||||||
private readonly UrlGeneratorInterface $router,
|
private readonly UrlGeneratorInterface $router,
|
||||||
protected bool $rootNodeExpandedByDefault,
|
protected bool $rootNodeExpandedByDefault,
|
||||||
protected bool $rootNodeEnabled,
|
protected bool $rootNodeEnabled,
|
||||||
|
//TODO: Make this configurable in the future
|
||||||
|
protected bool $rootNodeRedirectsToNewEntity = false,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -174,10 +175,7 @@ class TreeViewGenerator
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($mode === 'list_parts_root' || $mode === 'devices') && $this->rootNodeEnabled) {
|
if (($mode === 'list_parts_root' || $mode === 'devices') && $this->rootNodeEnabled) {
|
||||||
//We show the root node as a link to the list of all parts
|
$root_node = new TreeViewNode($this->entityClassToRootNodeString($class), $this->entityClassToRootNodeHref($class), $generic);
|
||||||
$show_all_parts_url = $this->router->generate('parts_show_all');
|
|
||||||
|
|
||||||
$root_node = new TreeViewNode($this->entityClassToRootNodeString($class), $show_all_parts_url, $generic);
|
|
||||||
$root_node->setExpanded($this->rootNodeExpandedByDefault);
|
$root_node->setExpanded($this->rootNodeExpandedByDefault);
|
||||||
$root_node->setIcon($this->entityClassToRootNodeIcon($class));
|
$root_node->setIcon($this->entityClassToRootNodeIcon($class));
|
||||||
|
|
||||||
|
|
@ -187,6 +185,27 @@ class TreeViewGenerator
|
||||||
return array_merge($head, $generic);
|
return array_merge($head, $generic);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function entityClassToRootNodeHref(string $class): ?string
|
||||||
|
{
|
||||||
|
//If the root node should redirect to the new entity page, we return the URL for the new entity.
|
||||||
|
if ($this->rootNodeRedirectsToNewEntity) {
|
||||||
|
return match ($class) {
|
||||||
|
Category::class => $this->router->generate('category_new'),
|
||||||
|
StorageLocation::class => $this->router->generate('store_location_new'),
|
||||||
|
Footprint::class => $this->router->generate('footprint_new'),
|
||||||
|
Manufacturer::class => $this->router->generate('manufacturer_new'),
|
||||||
|
Supplier::class => $this->router->generate('supplier_new'),
|
||||||
|
Project::class => $this->router->generate('project_new'),
|
||||||
|
default => null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return match ($class) {
|
||||||
|
Project::class => $this->router->generate('project_new'),
|
||||||
|
default => $this->router->generate('parts_show_all')
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
protected function entityClassToRootNodeString(string $class): string
|
protected function entityClassToRootNodeString(string $class): string
|
||||||
{
|
{
|
||||||
return match ($class) {
|
return match ($class) {
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
<div class="carousel-item {% if loop.first %}active{% endif %}">
|
<div class="carousel-item {% if loop.first %}active{% endif %}">
|
||||||
<a href="{{ entity_url(pic, 'file_view') }}" data-turbo="false" target="_blank" rel="noopener">
|
<a href="{{ entity_url(pic, 'file_view') }}" data-turbo="false" target="_blank" rel="noopener">
|
||||||
<img class="d-block w-100 img-fluid img-thumbnail bg-light part-info-image" src="{{ entity_url(pic, 'file_view') }}" alt="">
|
<img class="d-block w-100 img-fluid img-thumbnail bg-light part-info-image" src="{{ entity_url(pic, 'file_view') }}" alt="">
|
||||||
|
{% if img_overlay %}
|
||||||
<div class="mask"></div>
|
<div class="mask"></div>
|
||||||
<div class="carousel-caption-hover">
|
<div class="carousel-caption-hover">
|
||||||
<div class="carousel-caption text-white">
|
<div class="carousel-caption text-white">
|
||||||
|
|
@ -21,6 +22,7 @@
|
||||||
<div>{{ entity_type_label(pic.element) }}</div>
|
<div>{{ entity_type_label(pic.element) }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue