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

Merge pull request #3336 from alchemy-fr/PHRAS-2910_Fix_order_manager_from_notification_link

Browse Source 
PHRAS-2910 #comment merge Order manager : Can't perform any action in order manager when coming from a notification in menu bar
This commit is contained in:
Nicolas Maillat
2020-02-17 16:00:25 +01:00
committed by GitHub
parent b43cb1d2c9 fbbd53a5a6
commit fd5ec6d918
3 changed files with 6 additions and 8 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 = [
'text' => $this->app->trans('%user% a passe une %opening_link% commande %end_link%', [
'%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>',])
, 'class' => ''
];

2
package.json
View File

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

10
yarn.lock
View File

@@ -7576,12 +7576,10 @@ phraseanet-common@^0.4.5-d:
jquery "^3.2.1"
js-cookie "^2.1.0"
pym.js "^1.3.1"
phraseanet-production-client@0.34.133-d:
version "0.34.133-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.133-d.tgz#41e10c29d839607364c52a0a824eaebc39f0c1a9"
integrity sha512-w4hKmjHtUsA94A0aLmp4O35hQuRM25i+HDmylmMKIT9wcn8Bm5ercZUEcbUQI7XNkBWj9V826XP0TcwHH6QExw==
phraseanet-production-client@0.34.128-d:
version "0.34.128-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.128-d.tgz#c24bebe16d99f67f45b22c7e62b783be135bf569"
integrity sha512-AZ6Mdx26yfjQ53Y2MSBtOoopsQ3+eHA5qiRLnoUgqm6CmDdYatUyFt7lzGRk1axmVYf+2yH7jNaoHKCxb/n9UA==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"