Remove prod/bridge/manager hardcoded urls

This commit is contained in:
Nicolas Le Goff
2014-02-28 13:10:33 +01:00
parent 5adc7604bb
commit 88f179ae80
6 changed files with 19 additions and 16 deletions

View File

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

View File

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

View File

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

View File

@@ -603,7 +603,7 @@
</li> </li>
<li class="divider"></li> <li class="divider"></li>
<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" /> <img src="/skins/icons/door.png" height="16" width="16" />
{% trans 'action : bridge' %} {% trans 'action : bridge' %}
</a> </a>

View File

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

View File

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