hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-3092_api-setmetadats-v3_master

Browse Source
This commit is contained in:
Nicolas Maillat
2020-06-05 14:26:21 +02:00
committed by GitHub
parent ce09e3226e af6273ac80
commit bde15c74a6
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php
View File

@@ -54,18 +54,20 @@ class RecordSubscriber implements EventSubscriberInterface
if (!$record->isStory()) { if (!$record->isStory()) {
$subdefs = $record->getDatabox()->get_subdef_structure()->getSubdefGroup($record->getType()); $subdefs = $record->getDatabox()->get_subdef_structure()->getSubdefGroup($record->getType());
foreach ($subdefs as $subdef) { if ($subdefs !== null) {
$payload = [ foreach ($subdefs as $subdef) {
'message_type' => MessagePublisher::SUBDEF_CREATION_TYPE, $payload = [
'payload' => [ 'message_type' => MessagePublisher::SUBDEF_CREATION_TYPE,
'recordId' => $event->getRecord()->getRecordId(), 'payload' => [
'databoxId' => $event->getRecord()->getDataboxId(), 'recordId' => $event->getRecord()->getRecordId(),
'subdefName' => $subdef->get_name(), 'databoxId' => $event->getRecord()->getDataboxId(),
'status' => $event->isNewRecord() ? MessagePublisher::NEW_RECORD_MESSAGE : '' 'subdefName' => $subdef->get_name(),
] 'status' => $event->isNewRecord() ? MessagePublisher::NEW_RECORD_MESSAGE : ''
]; ]
];
$this->messagePublisher->publishMessage($payload, MessagePublisher::SUBDEF_QUEUE); $this->messagePublisher->publishMessage($payload, MessagePublisher::SUBDEF_QUEUE);
}
} }
} }
} }

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.214-d", "phraseanet-production-client": "0.34.219-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

8
templates/web/prod/WorkZone/Browser/Basket.html.twig
View File

@@ -1,6 +1,6 @@
<div class="PNB"> <div class="PNB">
<div class="PNB header" style="height:40px;bottom:auto;"> <div class="PNB header" style="height:40px;bottom:auto;">
<table> <table class="detailed_basket_browser">
<tr> <tr>
<td style="width:230px;"> <td style="width:230px;">
<a href="#" class="back"> <a href="#" class="back">
@@ -23,9 +23,9 @@
</span> </span>
</a> </a>
{% endif %} {% endif %}
<a class="basket_link" href="#"> <span class="basket_link" title="{{ Basket.getName() }}">
{{ Basket.getName() }} {{ Basket.getName()|length > 55 ? Basket.getName()|slice(0, 52) ~ '...' : Basket.getName() }}
</a> </span>
</h1> </h1>
</td> </td>
</tr> </tr>

4
templates/web/prod/WorkZone/Browser/Results.html.twig
View File

@@ -40,8 +40,8 @@
&nbsp; &nbsp;
</a> </a>
{% endif %} {% endif %}
<a class="basket_link" href="{{ path('prod_workzone_basket', { basket : Basket.getId() }) }}"> <a title="{{ Basket.getName()}}" class="basket_link" href="{{ path('prod_workzone_basket', { basket : Basket.getId() }) }}">
<span>{{ Basket.getName() }}</span> <span> {{ Basket.getName()|length > 80 ? Basket.getName()|slice(0, 77) ~ '...' : Basket.getName() }}</span>
<br><span class="basketCount"> <br><span class="basketCount">
{{ Basket.getElements().count() }} {{ ' records' }} {{ Basket.getElements().count() }} {{ ' records' }}
</span></a> </span></a>

8
yarn.lock
View File

@@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.214-d: phraseanet-production-client@0.34.219-d:
version "0.34.214-d" version "0.34.219-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.214-d.tgz#55675c3925c81626ddd8b9498e02c9d106a51d93" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.219-d.tgz#9bd118d0588af0ca58b60ef6b8f2514b6a9ffe63"
integrity sha512-RXg7KMgpPtv4rR3c2tCNMr7RgneAZjvBbFyGVx+a42nPkkZMnulweDm1R2o5d/eOcW6uJWPWczSmCCS0GqNnVQ== integrity sha512-QHLsPBRjtE4wSH5jib6gN71U70lAtoloM5E+NfmFKHLBMv0B8xqcxJKVW7EbRX4DZTpsLCu5tuZ7vzd5PpbkOg==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"