Changeset 17900

Show
Ignore:
Timestamp:
08/18/08 06:40:40 (5 months ago)
Author:
vmalykhin
Message:

datacleaner workflow's support

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/core/web/jsp/workflow/xsl/workflow_designer.xsl

    r17043 r17900  
    4040<xsl:template match="workflow"><tr class="tableContent" align="left">  
    4141  <td class="tableContent"> 
    42         <xsl:variable name="mypos" select="position()" /> 
    43         <xsl:apply-templates select="workflow_id"> 
    44           <xsl:with-param name="pos" select="$mypos" /> 
    45     </xsl:apply-templates> 
     42          <input id="workflow{name}" name="workflow_id" type="radio" value="{workflow_id}" /> 
    4643  </td> 
    4744  <td class="tableContent"> 
     
    7168<xsl:template match="name"><xsl:apply-templates/></xsl:template> 
    7269 
    73 <xsl:template match="workflow_id"> 
    74 <xsl:param name="pos" /> 
    75 <xsl:choose> 
    76         <xsl:when test="$pos=1"> 
    77                 <input name="workflow_id" type="radio" value="{.}" /> 
    78         </xsl:when> 
    79         <xsl:otherwise> 
    80                 <input name="workflow_id" type="radio" value="{.}" /> 
    81         </xsl:otherwise> 
    82 </xsl:choose> 
    83 </xsl:template> 
    84  
    8570<xsl:template name="no_workflows"> 
    8671<tr class="tableContent" align="left">  
  • trunk/test/acceptance/src/net/project/test/acceptance/framework/PnetAcceptanceTestFramework.java

    r17898 r17900  
    422422                clickActionWorkflow(); 
    423423                clickLinkWithExactText("Workflow Designer"); 
     424                assertLinkPresentWithExactText(name); 
     425                clickRadioOptionWithId("workflow" + name); 
     426                clickActionRemove(); 
     427                setExpectedJavaScriptConfirm("Remove this Workflow?", true); 
     428                assertTextPresent("There was a problem performing the remove"); 
     429                assertTextPresent("A workflow may not be removed while it is published"); 
    424430                 
     431                clickCancelActionbarButton(); 
     432                clickRadioOptionWithId("workflow" + name); 
     433                clickLinkWithExactText(name); 
     434                assertTextPresent("Change to unpublished"); 
     435                clickSubmitActionbarButton(); 
     436                clickLinkWithExactText("Workflow Designer"); 
     437                clickRadioOptionWithId("workflow" + name); 
     438                clickActionRemove(); 
     439                setExpectedJavaScriptConfirm("Remove this Workflow?", true); 
    425440                 
    426                  
     441                assertLinkNotPresentWithExactText(name); 
    427442        } 
    428443 
     
    757772        assertLinkPresentWithExactText(newWorkflowName); 
    758773 
    759         /*_dataCleaner.registerCreatedObject( 
    760                         new PnetWorkflowObject(existentProjectName, newWorkflowName));*/ 
     774        _dataCleaner.registerCreatedObject( 
     775                        new PnetWorkflowObject(existentProjectName, newWorkflowName)); 
    761776         
    762777        return newWorkflowName;