mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Remove prod/bridge/manager hardcoded urls
This commit is contained in:
@@ -32,7 +32,8 @@ class Bridge implements ControllerProviderInterface
|
||||
$app['bridge.controller'] = $this;
|
||||
|
||||
$controllers
|
||||
->post('/manager/', 'bridge.controller:doPostManager');
|
||||
->post('/manager/', 'bridge.controller:doPostManager')
|
||||
->bind('prod_bridge_manager');
|
||||
|
||||
$controllers
|
||||
->get('/login/{api_name}/', 'bridge.controller:doGetLogin')
|
||||
|
@@ -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>
|
||||
|
||||
|
@@ -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({
|
||||
|
@@ -603,7 +603,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" />
|
||||
{% trans 'action : bridge' %}
|
||||
</a>
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user