Project

General

Profile

« Previous | Next » 

Revision 5037

Added by daigle over 15 years ago

point workflow requests to the new workflow servlet.

View differences:

lib/style/common/scheduledWorkflowResultset.xsl
35 35
	<xsl:param name="qformat">default</xsl:param>
36 36
	<xsl:param name="enableediting">false</xsl:param>
37 37
	<xsl:param name="contextURL"/>
38
	<xsl:param name="webServletURL"/>
38
	<xsl:param name="servletURL"/>
39 39
	
40 40
	<xsl:template match="/">  
41 41
		<div class="row row-header" >
......
79 79
							<xsl:choose>
80 80
							<xsl:when test="./status = 'scheduled'">
81 81
								<xsl:attribute name="class">underlined</xsl:attribute>
82
								<xsl:attribute name="href"><xsl:value-of select='$webServletURL' />?action=unscheduleWorkflow&amp;workflowjobid=<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;qformat=<xsl:value-of select='$qformat' />&amp;forwardto=scheduleWorkflowRun.jsp</xsl:attribute>
82
								<xsl:attribute name="href"><xsl:value-of select='$servletURL' />?action=unscheduleWorkflow&amp;workflowjobid=<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;qformat=<xsl:value-of select='$qformat' />&amp;forwardto=scheduleWorkflowRun.jsp</xsl:attribute>
83 83
								Unschedule
84 84
							</xsl:when>
85 85
							<xsl:otherwise>
86 86
								<xsl:attribute name="class">underlined</xsl:attribute>
87
								<xsl:attribute name="href"><xsl:value-of select='$webServletURL' />?action=rescheduleWorkflow&amp;workflowjobid=<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;qformat=<xsl:value-of select='$qformat' />&amp;forwardto=scheduleWorkflowRun.jsp</xsl:attribute>
87
								<xsl:attribute name="href"><xsl:value-of select='$servletURL' />?action=rescheduleWorkflow&amp;workflowjobid=<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;qformat=<xsl:value-of select='$qformat' />&amp;forwardto=scheduleWorkflowRun.jsp</xsl:attribute>
88 88
								Reschedule
89 89
							</xsl:otherwise>
90 90
							</xsl:choose>
......
93 93
						<xsl:when test="./status = 'unscheduled'">
94 94
							<a>
95 95
								<xsl:attribute name="class">underlined</xsl:attribute>
96
								<xsl:attribute name="href"><xsl:value-of select='$webServletURL' />?action=deleteScheduledWorkflow&amp;workflowjobid=<xsl:value-of select='./name' />&amp;&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;qformat=<xsl:value-of select='$qformat' />&amp;forwardto=scheduleWorkflowRun.jsp</xsl:attribute>
96
								<xsl:attribute name="href"><xsl:value-of select='$servletURL' />?action=deleteScheduledWorkflow&amp;workflowjobid=<xsl:value-of select='./name' />&amp;&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;qformat=<xsl:value-of select='$qformat' />&amp;forwardto=scheduleWorkflowRun.jsp</xsl:attribute>
97 97
								Delete	
98 98
							</a>
99 99
						</xsl:when>
lib/style/common/common-settings.jsp
1 1
<%@ page errorPage="jsperrorpage.html"%>
2
<%@page import="edu.ucsb.nceas.metacat.service.PropertyService,edu.ucsb.nceas.metacat.util.SystemUtil"%>
2
<%@page import="edu.ucsb.nceas.metacat.properties.PropertyService,edu.ucsb.nceas.metacat.util.SystemUtil"%>
3 3
<%
4 4
	 /**
5 5
	 *   '$RCSfile$'
......
75 75
	String CGI_URL = SystemUtil.getCGI_URL();
76 76
	String CONTEXT_URL = SystemUtil.getContextURL();
77 77
	String SERVLET_URL = SystemUtil.getServletURL();
78
	String WEB_SERVLET_URL = SystemUtil.getWebServletURL();
79 78
	String STYLE_SKINS_URL = SystemUtil.getStyleSkinsURL();
80 79
	String STYLE_COMMON_URL = SystemUtil.getStyleCommonURL();
81 80
	String DEFAULT_STYLE_URL = SystemUtil.getDefaultStyleURL();
lib/style/common/scheduleWorkflowRunSection.jsp
38 38
        <script language="JavaScript" type="text/JavaScript" src="<%=STYLE_COMMON_URL%>/scheduleWorkflow.js"></script>
39 39
        
40 40
    </head>
41
    <body onload="getWorkflowRunSection('<%=WEB_SERVLET_URL%>','<%=request.getParameter("workflowid")%>','<%=request.getParameter("workflowname")%>','workflow-run-content')">    
41
    <body onload="getWorkflowRunSection('<%=SERVLET_URL%>','<%=request.getParameter("workflowid")%>','<%=request.getParameter("workflowname")%>','workflow-run-content')">    
42 42
    	<div class=content-section>  
43 43
    	    <div class="content-subsection" id="workflow-summary-section"> 
44 44
				<div class="result-header-emphasis">Workflow Summary</div> 
......
64 64
			</div>
65 65
			<div class="content-subsection" id="schedule-section">   
66 66
    			<div class="result-header-emphasis">Schedule Workflow </div> 
67
        		<form action="<%=WEB_SERVLET_URL%>" name="workflowScheduler" id="workflowScheduler">
67
        		<form action="<%=SERVLET_URL%>" name="workflowScheduler" id="workflowScheduler">
68 68
					<input name="qformat" value="sanparks" type="hidden" />
69 69
					<input name="action" value="scheduleWorkflow" type="hidden" />  
70 70
					<input name="forwardto" value="scheduleWorkflowRun.jsp" type="hidden" /> 

Also available in: Unified diff