Skip to content

fixes #568 #589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtesser merged 1 commit into from
Jun 13, 2012
Merged

fixes #568 #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 56 additions & 56 deletions dotCMS/html/portlet/ext/workflows/schemes/view_action.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,25 @@
WorkflowScheme scheme = new WorkflowScheme();
scheme = wapi.findScheme(schemeId);
List<WorkflowStep> steps = wapi.findSteps(scheme);

List<WorkflowActionClass> subActions = wapi.findActionClasses(action);

%>
<script>
dojo.ready(function(){
actionAdmin.actionlets = new Array();
mainAdmin.resetCrumbTrail();
mainAdmin.addCrumbtrail("<%=LanguageUtil.get(pageContext, "Workflows")%>", "/html/portlet/ext/workflows/schemes/view_schemes.jsp");
mainAdmin.addCrumbtrail("<%=LanguageUtil.get(pageContext, "Scheme")%> : <%=(scheme.isArchived()) ? "<strike>" :""%><%=scheme.getName()%><%=(scheme.isArchived()) ? "</strike>" :""%>", stepAdmin.baseJsp + "?schemeId=<%=schemeId%>");

mainAdmin.addCrumbtrail("<%=LanguageUtil.get(pageContext, "Step")%> : <%=step.getName()%>", stepAdmin.baseJsp + "?schemeId=<%=schemeId%>");
mainAdmin.addCrumbtrail("<%=LanguageUtil.get(pageContext, "Action")%>", actionAdmin.baseJsp + "?stepId=<%=stepId%>" );
mainAdmin.refreshCrumbtrail();
mainAdmin.refreshCrumbtrail();







var permissionSelect = new dijit.form.FilteringSelect({
id: "whoCanUseSelect",
name: "whoCanUseSelect",
Expand All @@ -80,10 +80,10 @@
}
},
"actionWhoCanUseSelect");




var assignSelect = new dijit.form.FilteringSelect({
id: "actionAssignToSelect",
name: "actionAssignToSelect",
Expand All @@ -101,17 +101,17 @@
dijit.byId("actionAssignToSelect").displayedValue="";

}

},
"actionAssignToSelect");

function setIconLabel(){
//alert(dijit.byId('actionIconSelect').item.value)
var x = dojo.attr("showIconSpan", "className",dijit.byId('actionIconSelect').item.value);

//dijit.byId('actionIconSelect').displayedValue = x;
}

var iconSelect = new dijit.form.FilteringSelect({
id: "actionIconSelect",
name: "actionIconSelect",
Expand All @@ -128,16 +128,16 @@
},
required:false,
onChange:setIconLabel,

},
"actionIconSelect");




//assignSelect._hasBeenBlurred=false;



actionAdmin.whoCanUse = new Array();
<% Set<Role> roles = APILocator.getPermissionAPI().getReadRoles(action);%>
Expand All @@ -146,28 +146,28 @@
<% }%>

actionAdmin.refreshWhoCanUse();



actionClassAdmin.actionClasses = new Array(),
<%for(WorkflowActionClass subaction : subActions){ %>
actionClassAdmin.addToActionClassesArray("<%=subaction.getId()%>", "<%=subaction.getName()%>");
<%} %>

actionClassAdmin.refreshActionClasses();

//actionAdmin.doChange();


});













</script>


Expand All @@ -178,7 +178,7 @@
<input type="hidden" name="schemeId" value="<%=UtilMethods.webifyString(scheme.getId())%>">
<input type="hidden" name="whoCanUse" id="whoCanUse" value="">
<input type="hidden" name="actionId" id="actionId" value="<%=UtilMethods.webifyString(action.getId())%>">

<table border="0">
<tr>
<td width="50%" valign="top" style="padding:7px;">
Expand Down Expand Up @@ -216,7 +216,7 @@
<div class="wfWhoCanUseDiv">
<table class="listingTable" id="whoCanUseTbl">
</table>
</div>
</div>
</td>
</tr>
</table>
Expand All @@ -228,7 +228,7 @@
<%=LanguageUtil.get(pageContext, "What-Action-Does")%>
</th>
</tr>

<tr>
<td nowrap="true"><%=LanguageUtil.get(pageContext, "Allow-Comments")%>:</td>
<td><input type="checkbox" name="actionCommentable"
Expand Down Expand Up @@ -259,7 +259,7 @@
</td>
</tr>
</table>


</td>
</tr>
Expand All @@ -275,26 +275,26 @@
<%}%>
<% }%>
</select>



</td>
</tr>
<tr>
<td nowrap="true"><%=LanguageUtil.get(pageContext, "Icon")%>:</td>
<td nowrap="nowrap">
<td nowrap="nowrap">
<div>
<div id="showIconSpan" class="<%=UtilMethods.webifyString(action.getIcon())%>" style="width:16px;height:16px;border:1px solid silver;padding:1px;margin-right:10px;display: inline-block;"></div>

<input id="actionIconSelect" name="actionIconSelect" />
</div>
</td>
</tr>

<tr>
<td valign="top"><%=LanguageUtil.get(pageContext, "Custom-Code")%>:</td>


<%
String textValue = action.getCondition();
if(textValue != null){
Expand All @@ -303,25 +303,25 @@
textValue = textValue.replaceAll(">", "&gt;");
}
else{
textValue="";
textValue="";
}
%>


<td>
<textarea id="actionCondition" style="min-width:300px;min-height:100px;font-family: monospace;" name="actionCondition"><%=textValue %></textarea>
</td>
</tr>


</table>
</td>
</tr>





</table>
</div>

Expand All @@ -342,11 +342,11 @@
</span>
&nbsp; &nbsp; &nbsp;
<%} %>


<span id="saveButtonDiv" class="saveButtonHide">
<button dojoType="dijit.form.Button"
onClick="actionAdmin.saveAction();" iconClass="saveIcon">
onClick="actionAdmin.saveAction('<%=stepId %>');" iconClass="saveIcon">
<%=LanguageUtil.get(pageContext, "Save")%>
</button>
</span>&nbsp;
Expand Down
Loading