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-2923_upgrade_Phraseanet-production-client

Browse Source
This commit is contained in:
Nicolas Maillat
2020-02-17 16:01:33 +01:00
committed by GitHub
parent a61e32b21f fd5ec6d918
commit fc4f9210b3
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/eventsmanager/notify/order.php
View File

@@ -42,7 +42,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
$ret = [ $ret = [
'text' => $this->app->trans('%user% a passe une %opening_link% commande %end_link%', [ 'text' => $this->app->trans('%user% a passe une %opening_link% commande %end_link%', [
'%user%' => $sender, '%user%' => $sender,
'%opening_link%' => '<a href="/prod/order/'.$order_id.'/" class="dialog full-dialog" title="'.$this->app->trans('Orders manager').'">', '%opening_link%' => '<a href="#" class="order-notif" data-id="'.$order_id.'" title="'.$this->app->trans('Orders manager').'">',
'%end_link%' => '</a>',]) '%end_link%' => '</a>',])
, 'class' => '' , 'class' => ''
]; ];

1
yarn.lock
View File

@@ -7577,6 +7577,7 @@ 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.135-d: phraseanet-production-client@0.34.135-d:
version "0.34.135-d" version "0.34.135-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.135-d.tgz#fafbeecc0bd7aac7271742596576d5601b35d93e" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.135-d.tgz#fafbeecc0bd7aac7271742596576d5601b35d93e"