lenya/src/webapp/lenya/xslt/scheduler common.xsl,1.3,1.4 scheduler-page.xsl,1.3,1.4

Update of /repository/lenya/src/webapp/lenya/xslt/scheduler
In directory erbium:/tmp/cvs-serv346/src/webapp/lenya/xslt/scheduler

Modified Files:
	common.xsl scheduler-page.xsl 
Log Message:
corrected scheduler parameter handling

Index: common.xsl
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/xslt/scheduler/common.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** common.xsl	16 May 2003 16:05:49 -0000	1.3
--- common.xsl	16 May 2003 18:34:54 -0000	1.4
***************
*** 19,28 ****
    <!-- ============================================================= -->
    <xsl:template name="scheduler-form">
    
      <xsl:variable name="date" select="//sch:current-date"/>
!   
      <input type="hidden" name="lenya.usecase" value="schedule"/>
      <input type="hidden" name="lenya.step" value="showscreen"/>
      
      <table class="scheduler-job" border="0" cellpadding="0" cellspacing="0">
  
--- 19,33 ----
    <!-- ============================================================= -->
    <xsl:template name="scheduler-form">
+     <xsl:param name="task-id"/>
    
      <xsl:variable name="date" select="//sch:current-date"/>
!     
!     <form method="GET">
      <input type="hidden" name="lenya.usecase" value="schedule"/>
      <input type="hidden" name="lenya.step" value="showscreen"/>
      
+     <input type="hidden" name="task.id" value="{$task-id}"/>
+     <xsl:call-template name="task-parameters"/>
+         
      <table class="scheduler-job" border="0" cellpadding="0" cellspacing="0">
  
***************
*** 34,39 ****
        </tr>
        <tr>
-       <form method="GET">
-         
          <!-- hidden input fields for parameters -->
          
--- 39,42 ----
***************
*** 84,90 ****
  	  <input type="submit" name="Action" value="Add"/>
  	</td>
!       </form>
!     </tr>
!   </table>
    </xsl:template>
    
--- 87,98 ----
  	  <input type="submit" name="Action" value="Add"/>
  	</td>
!       </tr>
!     </table>
!     </form>
!   </xsl:template>
!   
!   
!   <!-- override this template to insert use-case specific task parameters. -->
!   <xsl:template name="task-parameters">
    </xsl:template>
    
***************
*** 116,120 ****
      </xsl:if>
    </xsl:template>
- 
  
  </xsl:stylesheet> 
--- 124,127 ----

Index: scheduler-page.xsl
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/xslt/scheduler/scheduler-page.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** scheduler-page.xsl	16 May 2003 15:55:34 -0000	1.3
--- scheduler-page.xsl	16 May 2003 18:34:54 -0000	1.4
***************
*** 90,94 ****
          &#160;
          <!-- hidden input fields for parameters -->
!         <xsl:call-template name="parameters-as-inputs"/>
          <xsl:apply-templates select="sch:parameter"/>
        </td>
--- 90,96 ----
          &#160;
          <!-- hidden input fields for parameters -->
!         <input type="hidden" name="lenya.usecase" value="schedule"/>
!         <input type="hidden" name="lenya.step" value="showscreen"/>
!         
          <xsl:apply-templates select="sch:parameter"/>
        </td>
***************
*** 142,168 ****
        </xsl:if>
      </xsl:for-each>
-   </xsl:template>
-   
-   <!-- ============================================================= -->
-   <!-- create hidden inputs for all request parameters -->
-   <!-- ============================================================= -->
-   <xsl:template name="parameters-as-inputs">
- <!--    <ul>-->
-     <input type="hidden" name="lenya.usecase" value="schedule"/>
-     <input type="hidden" name="lenya.step" value="showscreen"/>
-     
-     <xsl:for-each select="/sch:scheduler/sch:parameters/sch:parameter">
-       <xsl:if test="not(starts-with(@name, 'job.'))">
-       <xsl:if test="not(starts-with(@name, 'trigger.'))">
-       <xsl:if test="not(starts-with(@name, 'task.id'))">
-       <xsl:if test="not(translate(@name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz') = 'action')">
-         <input type="hidden" name="{@name}" value="{@value}"/>
- <!--        <li>Parameter: <xsl:value-of select="@name"/> = <xsl:value-of select="@value"/></li>-->
-       </xsl:if>
-       </xsl:if>
-       </xsl:if>
-       </xsl:if>
-     </xsl:for-each>
- <!--    </ul>-->
    </xsl:template>
    
--- 144,147 ----