diff --git a/Phraseanet-production-client/dist/production.js b/Phraseanet-production-client/dist/production.js index d18157d6ca..04156109f8 100644 --- a/Phraseanet-production-client/dist/production.js +++ b/Phraseanet-production-client/dist/production.js @@ -65504,6 +65504,8 @@ var previewRecordService = function previewRecordService(services) { basketIcon = ""; } else if (data.containerType === 'push') { basketIcon = ""; + } else if (data.containerType === 'regroup') { + basketIcon = ""; } else { basketIcon = ""; } diff --git a/Phraseanet-production-client/dist/production.min.js b/Phraseanet-production-client/dist/production.min.js index d18157d6ca..04156109f8 100644 --- a/Phraseanet-production-client/dist/production.min.js +++ b/Phraseanet-production-client/dist/production.min.js @@ -65504,6 +65504,8 @@ var previewRecordService = function previewRecordService(services) { basketIcon = ""; } else if (data.containerType === 'push') { basketIcon = ""; + } else if (data.containerType === 'regroup') { + basketIcon = ""; } else { basketIcon = ""; } diff --git a/Phraseanet-production-client/src/components/record/recordPreview/index.js b/Phraseanet-production-client/src/components/record/recordPreview/index.js index 38b0089fb8..75bb9f7d51 100644 --- a/Phraseanet-production-client/src/components/record/recordPreview/index.js +++ b/Phraseanet-production-client/src/components/record/recordPreview/index.js @@ -386,7 +386,9 @@ const previewRecordService = services => { if (data.containerType === 'feedback') { basketIcon = ""; } else if (data.containerType === 'push') { - basketIcon = ""; + basketIcon = ""; + } else if (data.containerType === 'regroup') { + basketIcon = ""; } else { basketIcon = ""; } diff --git a/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php b/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php index 55f18cc959..fa7a92c237 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php @@ -113,6 +113,8 @@ class RecordController extends Controller } else { $containerType = 'basket'; } + } elseif ($env === 'REG') { + $containerType = 'regroup'; } return $this->app->json([ diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php index 63666f5d7b..5dfd06c67f 100644 --- a/lib/classes/record/preview.php +++ b/lib/classes/record/preview.php @@ -118,6 +118,7 @@ class record_preview extends record_adapter $this->container = new record_adapter($app, $sbas_id, $record_id); $this->original_item = $this->container; + $this->name = $this->container->get_title(); if ($pos == 0) { $number = 0; } else { @@ -273,14 +274,14 @@ class record_preview extends record_adapter $this->title .= $this->name . ' (' . $this->getNumber() . '/' . $this->total . ') - ' . parent::get_title($options); break; case "REG": - $title = parent::get_title($options); - if ($this->getNumber() == 0) { - $this->title .= $title; - } else { + $this->title .= $this->name; + + if ($this->getNumber() != 0) { $this->title .= sprintf( - '%s %s', $title, $this->getNumber() . '/' . $this->total + ' (%s) - %s',$this->getNumber() . '/' . $this->total, parent::get_title($options) ); } + break; default: $this->title .= parent::get_title($options); diff --git a/templates/web/prod/preview/appears_in.html.twig b/templates/web/prod/preview/appears_in.html.twig index 988bcde86d..7c600bd34c 100644 --- a/templates/web/prod/preview/appears_in.html.twig +++ b/templates/web/prod/preview/appears_in.html.twig @@ -7,8 +7,14 @@ data-position="0" data-id="{{par.get_serialize_key()}}" data-reload="true" - class="otherRegToolTip open-preview-action" {% if app['conf'].get(['registry', 'classic', 'stories-preview']) %}tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : par.get_sbas_id(), 'record_id' : par.get_record_id(), 'context' : 'basket' }) }}" {% endif %}> - + class="otherRegToolTip to-open-preview-action" {% if app['conf'].get(['registry', 'classic', 'stories-preview']) %}tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : par.get_sbas_id(), 'record_id' : par.get_record_id(), 'context' : 'basket' }) }}" {% endif %}> + + {% if par.get_thumbnail().is_physically_present() %} + + {% else %} + + {% endif %} + {{ par.get_title() }} {% endfor %}