Merge branch '3.8'

Conflicts:
	lib/classes/Bridge/Api/Dailymotion.php
	lib/classes/Bridge/Api/Flickr.php
	lib/classes/Bridge/Api/Interface.php
	lib/classes/DailymotionWithoutOauth2.php

lib/Alchemy/Phrasea/Controller/Prod/Bridge.php

@@ -32,7 +32,8 @@ class Bridge implements ControllerProviderInterface
         });
 
         $controllers
-            ->post('/manager/', 'bridge.controller:doPostManager');
+            ->post('/manager/', 'bridge.controller:doPostManager')
+            ->bind('prod_bridge_manager');
 
         $controllers
             ->get('/login/{api_name}/', 'bridge.controller:doGetLogin')

lib/classes/Bridge/Api/Dailymotion.php

@@ -425,7 +425,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
                         return $this->get_container_from_id(self::CONTAINER_TYPE_PLAYLIST, $container_id);
                         break;
                     default:
-                        throw new Bridge_Exception_ContainerUnknown('Unknown element ' . $destination);
+                        throw new Bridge_Exception_ContainerUnknown('Unknown element ' . $container);
                         break;
                 }
                 break;
@@ -570,8 +570,8 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
     {
         switch ($record->get_type()) {
             case self::ELEMENT_TYPE_VIDEO :
-                $url_file = $this->_api->uploadFileWithToken($record->get_hd_file()->getRealPath(), $this->oauth_token);
+                $url_file = $this->_api->sendFile($record->get_hd_file()->getRealPath(), $this->oauth_token);
-                $options = array_merge(['url'  => $url_file], $options);
+                $options = array_merge(array('url'  => $url_file), $options);
                 $video = $this->_api->call('POST /me/videos', $options, $this->oauth_token);
 
                 return $video["id"];

lib/classes/Bridge/Api/Flickr.php

@@ -193,7 +193,7 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf
                     throw new Bridge_Exception_ApiConnectorRequestFailed('Unable to retrieve photoset infos for ' . $object);
 
                 $xml = $response->getXml();
-                $primary_photo = $this->get_element_from_id((string) $xml['primary'], self::ELEMENT_TYPE_PHOTO);
+                $primary_photo = $this->get_element_from_id((string) $xml->photo['id'], self::ELEMENT_TYPE_PHOTO);
 
                 return new Bridge_Api_Flickr_Container($xml, $this->get_user_id(), $object, $primary_photo->get_thumbnail());
                 break;

lib/classes/Bridge/Api/Interface.php

@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  */
 
+use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\HttpFoundation\Request;
 
 interface Bridge_Api_Interface

lib/classes/DailymotionWithoutOauth2.php

@@ -64,7 +64,7 @@ class DailymotionWithoutOauth2 extends Dailymotion
      *
      * @return String the resulting URL
      */
-    public function uploadFileWithToken($filePath, $oauth_token)
+    public function sendFile($filePath, $oauth_token)
     {
         $result = $this->call('file.upload', [], $oauth_token);
         $timeout = $this->timeout;

templates/web/prod/actions/Bridge/callback.html.twig

@@ -6,7 +6,7 @@
     {% if error_message is empty %}
 
      <script type="text/javascript">
-        window.opener.publicator_reload_publicator();
+        window.opener.publicator_reload_publicator("{{ path("prod_bridge_manager") }}");
         window.close();
       </script>
 

templates/web/prod/actions/Bridge/index.html.twig

@@ -1,7 +1,7 @@
 
 {% import "common/thumbnail.html.twig" as thumb %}
 
-<div class="PNB" id='dialog_publicator'>
+<div class="PNB" id='dialog_publicator' data-url="{{ path("prod_bridge_manager") }}">
     <div id='publicator_selection' class="PNB10 ui-corner-all">
         <div class="PNB10">
             {% for id, record in route.get_elements %}
@@ -86,6 +86,7 @@
 $(function() {
   var pub_tabs = $("#pub_tabs");
   var container = $('#dialog_publicator');
+  var managerUrl =  container.data("url");
 
   function popme(url) {
     var newwindow=window.open(url,'logger','height=500,width=800');
@@ -157,7 +158,7 @@ $(function() {
                     success: function(datas){
                         if(datas.success) {
                             confirmBox.Close();
-                            publicator_reload_publicator();
+                            publicator_reload_publicator(managerUrl);
                         } else {
                             confirmBox.Close();
                             var alertBox = p4.Dialog.Create({

templates/web/prod/index.html.twig

@@ -607,7 +607,7 @@
                                     </li>
                                     <li class="divider"></li>
                                     <li>
-                                        <a class="TOOL_bridge_btn results_window">
+                                        <a class="TOOL_bridge_btn results_window" href="{{ path("prod_bridge_manager") }}">
                                             <img src="/skins/icons/door.png" height="16" width="16" />
                                             {{ 'action : bridge' | trans }}
                                         </a>

www/skins/prod/jquery.main-prod.js

@@ -1665,27 +1665,28 @@ function activeIcons() {
         }
     });
 
-    $('.TOOL_bridge_btn').live('click', function () {
+    $('.TOOL_bridge_btn').live('click', function (e) {
-
+        e.preventDefault();
+        var $button = $(this);
         var datas = {};
 
-        if ($(this).hasClass('results_window')) {
+        if ($button.hasClass('results_window')) {
             if (p4.Results.Selection.length() > 0)
                 datas.lst = p4.Results.Selection.serialize();
         }
         else {
-            if ($(this).hasClass('basket_window')) {
+            if ($button.hasClass('basket_window')) {
                 if (p4.WorkZone.Selection.length() > 0)
                     datas.lst = p4.WorkZone.Selection.serialize();
                 else
                     datas.ssel = $('.SSTT.active').attr('id').split('_').slice(1, 2).pop();
             }
             else {
-                if ($(this).hasClass('basket_element')) {
+                if ($button.hasClass('basket_element')) {
                     datas.ssel = $('.SSTT.active').attr('id').split('_').slice(1, 2).pop();
                 }
                 else {
-                    if ($(this).hasClass('story_window')) {
+                    if ($button.hasClass('story_window')) {
                         if (p4.WorkZone.Selection.length() > 0) {
                             datas.lst = p4.WorkZone.Selection.serialize();
                         }
@@ -1698,7 +1699,7 @@ function activeIcons() {
         }
 
         if (datas.ssel || datas.lst || datas.story) {
-            init_publicator(datas);
+            init_publicator($button.attr("href"), datas);
         }
         else {
             alert(language.nodocselected);

www/skins/prod/publicator.js

@@ -1,15 +1,15 @@
-function publicator_reload_publicator() {
+function publicator_reload_publicator(url) {
     var options = $('#dialog_publicator form[name="current_datas"]').serializeArray();
     var dialog = p4.Dialog.get(1);
-    dialog.load('/prod/bridge/manager/', 'POST', options);
+    dialog.load(url, 'POST', options);
 }
 
-function init_publicator(datas) {
+function init_publicator(url, datas) {
     var dialog = p4.Dialog.Create({
         size: 'Full',
         title: 'Bridge',
         loading: false
     });
 
-    dialog.load('/prod/bridge/manager/', 'POST', datas);
+    dialog.load(url, 'POST', datas);
 }