Project

General

Profile

« Previous | Next » 

Revision 5821

Added by Jing Tao over 13 years ago

Add more parameters such as sessionid, authenticationURL and authorizationURL for unscheduleWorkflow, rescheduleWorkflow and delete action.

View differences:

lib/style/skins/sanparks/settings.jsp
52 52
  String authenticationPath = PropertyService.getProperty("workflowScheduler.authenticationPath");
53 53
  String queryPath = PropertyService.getProperty("workflowScheduler.queryPath");
54 54
  String authenticationServiceURL = CONTEXT_URL+authenticationPath;
55
  String authorizationServiceURL = CONTEXT_URL+authorizationPath;
55 56
%>
lib/style/skins/sanparks/scheduleWorkflowRun.jsp
54 54
        <script language="JavaScript" type="text/JavaScript" src="<%=STYLE_COMMON_URL%>/ajax-utils.js"></script>
55 55
        <script language="JavaScript" type="text/JavaScript" src="<%=STYLE_COMMON_URL%>/scheduleWorkflow.js"></script>
56 56
    </head>
57
    <body onload="getWorkflowRunSection('<%=SERVLET_URL%>','<%=request.getParameter("workflowid")%>','<%=request.getParameter("workflowname")%>','<%=request.getParameter("karid")%>','workflow-run-content')">
57
    <body onload="getWorkflowRunSection('<%=SERVLET_URL%>','<%=request.getParameter("workflowid")%>','<%=request.getParameter("workflowname")%>','<%=request.getParameter("karid")%>','<%=request.getSession().getId()%>','<%=authenticationServiceURL%>','<%=authorizationServiceURL%>','workflow-run-content')">
58 58
		<table class="page-section" cellpadding="0" cellspacing="0" border="0">
59 59
        	<tr>
60 60
        		<td>
lib/style/common/scheduleWorkflow.js
31 31
 *    url - metacat url to hit
32 32
 *    workflowId - lsid of the workflow
33 33
 *    karid - the lsid of the kar file which contains the workflow
34
 *    sessionid - id of the session
35
 *    authServiceURL - the url of the authentication service
36
 *    authorizationURL - the url of the authorization service
34 37
 *    workflowName - used for display purposes.  
35 38
 *    divId - the name of the div where the results should be put
36 39
 */  
37
function getWorkflowRunSection(url, workflowId, workflowName, karid, divId) {
38
	var requestUrl = url + '?action=getScheduledWorkflow&workflowid=' + workflowId +'&karid='+karid+ '&qformat=sanparks&workflowname=' + workflowName;
39
	//alert('getWorkflowRunSection - url: ' + url + ' workflowId: ' + workflowId + ' workflowName: ' + workflowName + ' divId: ' + divId+' karid: '+karid);
40
function getWorkflowRunSection(url, workflowId, workflowName, karid, sessionid,  authServiceURL, authorizationURL, divId) {
41
	var requestUrl = url + '?action=getScheduledWorkflow&workflowid=' + workflowId +'&karid='+karid+ '&qformat=sanparks&workflowname=' + workflowName
42
	                             +'&sessid='+sessionid+'&authServiceURL='+authServiceURL+'&authorizationURL='+authorizationURL;
43
	//alert('getWorkflowRunSection - url: ' + url + ' workflowId: ' + workflowId + ' workflowName: ' + workflowName + ' divId: ' + divId+' karid: '+karid+' authServiceURL: '+authServiceURL+'authorizationURL: '+authorizationURL);
40 44
	var submitResults = submitUrlIntoDiv(requestUrl, divId);
41 45
}
42 46

  
lib/style/common/scheduledWorkflowResultset.xsl
36 36
	<xsl:param name="enableediting">false</xsl:param>
37 37
	<xsl:param name="contextURL"/>
38 38
	<xsl:param name="servletURL"/>
39
	<xsl:param name ="authServiceURL"/>
40
    <xsl:param name ="authorizationURL"/>
39 41
	
40 42
	<xsl:template match="/">  
41 43
		<div class="row row-header" >
......
79 81
							<xsl:choose>
80 82
							<xsl:when test="./status = 'scheduled'">
81 83
								<xsl:attribute name="class">underlined</xsl:attribute>
82
								<xsl:attribute name="href"><xsl:value-of select='$servletURL' />?action=unscheduleWorkflow&amp;workflowjobname=<xsl:value-of select='./name' />&amp;workflowname=<xsl:value-of select='./jobParam[@name=&apos;workflowname&apos;]/value' />&amp;workflowid=<xsl:value-of select='./jobParam[@name=&apos;workflowid&apos;]/value' />&amp;karid=<xsl:value-of select='./jobParam[@name=&apos;karid&apos;]/value' />&amp;qformat=<xsl:value-of select='$qformat' />&amp;forwardto=scheduleWorkflowRun.jsp</xsl:attribute>
84
								<xsl:attribute name="href"><xsl:value-of select='$servletURL' />?action=unscheduleWorkflow&amp;workflowjobname=<xsl:value-of select='./name' />&amp;sessionid=<xsl:value-of select='$sessid' />&amp;authServiceURL=<xsl:value-of select='$authServiceURL' />&amp;authorizationURL=<xsl:value-of select='$authorizationURL' />&amp;qformat=<xsl:value-of select='$qformat' />&amp;forwardto=scheduleWorkflowRun.jsp</xsl:attribute>
83 85
								Unschedule
84 86
							</xsl:when>
85 87
							<xsl:otherwise>
86 88
								<xsl:attribute name="class">underlined</xsl:attribute>
87
								<xsl:attribute name="href"><xsl:value-of select='$servletURL' />?action=rescheduleWorkflow&amp;workflowjobname=<xsl:value-of select='./name' />&amp;workflowname=<xsl:value-of select='./jobParam[@name=&apos;workflowname&apos;]/value' />&amp;workflowid=<xsl:value-of select='./jobParam[@name=&apos;workflowid&apos;]/value' />&amp;karid=<xsl:value-of select='./jobParam[@name=&apos;karid&apos;]/value' />&amp;qformat=<xsl:value-of select='$qformat' />&amp;forwardto=scheduleWorkflowRun.jsp</xsl:attribute>
89
								<xsl:attribute name="href"><xsl:value-of select='$servletURL' />?action=rescheduleWorkflow&amp;workflowjobname=<xsl:value-of select='./name' />&amp;sessionid=<xsl:value-of select='$sessid' />&amp;authServiceURL=<xsl:value-of select='$authServiceURL' />&amp;authorizationURL=<xsl:value-of select='$authorizationURL' />&amp;qformat=<xsl:value-of select='$qformat' />&amp;forwardto=scheduleWorkflowRun.jsp</xsl:attribute>
88 90
								Reschedule
89 91
							</xsl:otherwise>
90 92
							</xsl:choose>
......
93 95
						<xsl:when test="./status = 'unscheduled'">
94 96
							<a>
95 97
								<xsl:attribute name="class">underlined</xsl:attribute>
96
								<xsl:attribute name="href"><xsl:value-of select='$servletURL' />?action=deleteScheduledWorkflow&amp;workflowjobname=<xsl:value-of select='./name' />&amp;workflowname=<xsl:value-of select='./jobParam[@name=&apos;workflowname&apos;]/value' />&amp;workflowid=<xsl:value-of select='./jobParam[@name=&apos;workflowid&apos;]/value' />&amp;karid=<xsl:value-of select='./jobParam[@name=&apos;karid&apos;]/value' />&amp;qformat=<xsl:value-of select='$qformat' />&amp;forwardto=scheduleWorkflowRun.jsp</xsl:attribute>
98
								<xsl:attribute name="href"><xsl:value-of select='$servletURL' />?action=deleteScheduledWorkflow&amp;workflowjobname=<xsl:value-of select='./name' />&amp;sessionid=<xsl:value-of select='$sessid' />&amp;authServiceURL=<xsl:value-of select='$authServiceURL' />&amp;authorizationURL=<xsl:value-of select='$authorizationURL' />&amp;qformat=<xsl:value-of select='$qformat' />&amp;forwardto=scheduleWorkflowRun.jsp</xsl:attribute>
97 99
								Delete	
98 100
							</a>
99 101
						</xsl:when>

Also available in: Unified diff