No commit message

No commit message

ui/nG6/pi1/class.tx_nG6_pi1.php

@@ -189,6 +189,7 @@ class tx_nG6_pi1 extends tslib_pibase {
 			$smarty->assign('server_name', $this->conf["server_name"]);
 			$smarty->assign('project_ids', substr($project_ids,0,-1));
 			$smarty->assign('pid', $this->conf['userpidList']);
+			$smarty->assign('server_url', $this->conf['server_url']);
 	
 			// If it's a single project, add runs and analysis information
 			if (count($projects) == 1) {
@@ -268,6 +269,7 @@ class tx_nG6_pi1 extends tslib_pibase {
 			$smarty->assign('user_id', $GLOBALS['TSFE']->fe_user->user['uid']);
 			$smarty->assign('data_folder', $this->conf["data"]);
 			$smarty->assign('server_name', $this->conf["server_name"]);
+			$smarty->assign('server_url', $this->conf['server_url']);
 			$smarty->assign('run_ids', substr($run_ids,0,-1));
 			
 			// If it's a single run, add analysis information

ui/nG6/pi1/project_view.tpl

@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <input type="hidden" id="view" value="project" />
 <input type="hidden" id="ids" value="{$project_ids}" />
 <input type="hidden" id="login_user" value="{$login_user}" />
+<input type="hidden" id="server_url" value="{$server_url}" />
 
 {* If no project can be displayed *}
 {if $projects|@count == 0 || ($projects|@count == 1 && $projects[key($projects)].hidden == 1 && !$projects[key($projects)].is_admin)}

ui/nG6/pi1/run_view.tpl

@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <input type="hidden" id="view" value="run" />
 <input type="hidden" id="ids" value="{$run_ids}" />
 <input type="hidden" id="login_user" value="{$login_user}" />
+<input type="hidden" id="server_url" value="{$server_url}" />
 
 {* If no runs can be displayed *}
 {if $runs|@count == 0 || ($runs|@count == 1 && $runs[key($runs)].hidden == 1 && !$runs[key($runs)].is_admin) }

ui/nG6/res/js/tx_nG6_pi1.js

@@ -1098,7 +1098,10 @@ function addRunHandler() {
 	$("#back_to_workflows_list").hide();
 	$('#availableWorkflows').html("wait");
 	$('#setAndRunModal').modal();
-	$('#availableWorkflows').availablewf({filters:["AddAnalysis", "AddProject"]});
+	$('#availableWorkflows').availablewf({
+		filters:["AddAnalysis", "AddProject"],
+		serverURL: $("#server_url").val()
+	});
 	$('#availableWorkflows').on('select', function(event, workflow) {
 		$("#myCarousel").carousel('next');
 		$("#myCarousel").carousel('pause');
@@ -1122,7 +1125,8 @@ function addRunHandler() {
 			workflowClass: workflow["class"],
 			displayRunButton: false,
 			displayResetButton: false,
-			parameters: parameters
+			parameters: parameters,
+			serverURL: $("#server_url").val()
 	    });	
 	});
     $('#selectedWfForm').on('run', function(event, running_wf) {    	
@@ -1135,7 +1139,8 @@ function addRunHandler() {
 	    $('#setAndRunModalLabel').html(running_wf["name"] + " <small>" + running_wf["id"] + "</small>");
 	    $('#monitoringWorkflow').wfstatus({
 	    	workflowID: running_wf.id,
-	    	forceUsingWorkflow: running_wf
+	    	forceUsingWorkflow: running_wf,
+	    	serverURL: $("#server_url").val()
 	    });
 	    refreshRunTable();
     });
@@ -1167,7 +1172,8 @@ function addProjectHandler(){
 		workflowClass: "AddProject",
 		displayRunButton: false,
 		displayResetButton: false,
-		parameters: {"admin_login": $("#user_login").val()}
+		parameters: {"admin_login": $("#user_login").val()},
+		serverURL: $("#server_url").val()
     });
     $('#setAndRunModalBody').on('run', function(event, running_wf) {
     	$.ajax({
@@ -1287,7 +1293,8 @@ function addAnalysisHandler(){
 		workflowClass: "AddAnalysis",
 		displayRunButton: false,
 		displayResetButton: false,
-		parameters: parameters
+		parameters: parameters,
+		serverURL: $("#server_url").val()
     });
 
     $('#wfForm').on('run', function(event, running_wf) {
@@ -1299,7 +1306,8 @@ function addAnalysisHandler(){
 	    $('#setAndRunModalLabel').html(running_wf["name"] + " <small>" + running_wf["id"] + "</small>");
 	    $('#monitoringWorkflow').wfstatus({
 	    	workflowID: running_wf.id,
-	    	forceUsingWorkflow: running_wf
+	    	forceUsingWorkflow: running_wf,
+	    	serverURL: $("#server_url").val()
 	    });
 	    refreshAnalysisTable();
     });