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

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
3 changed files with 6 additions and 8 deletions

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' => ''
]; ];

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.133-d", "phraseanet-production-client": "0.34.128-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",

View File

@@ -7576,12 +7576,10 @@ phraseanet-common@^0.4.5-d:
jquery "^3.2.1" jquery "^3.2.1"
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.128-d:
version "0.34.128-d"
phraseanet-production-client@0.34.133-d: resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.128-d.tgz#c24bebe16d99f67f45b22c7e62b783be135bf569"
version "0.34.133-d" integrity sha512-AZ6Mdx26yfjQ53Y2MSBtOoopsQ3+eHA5qiRLnoUgqm6CmDdYatUyFt7lzGRk1axmVYf+2yH7jNaoHKCxb/n9UA==
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.133-d.tgz#41e10c29d839607364c52a0a824eaebc39f0c1a9"
integrity sha512-w4hKmjHtUsA94A0aLmp4O35hQuRM25i+HDmylmMKIT9wcn8Bm5ercZUEcbUQI7XNkBWj9V826XP0TcwHH6QExw==
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"