Skip to content
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

#30900 draft for first changes on force unlock #30906

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

#30900 draft for first changes on force unlock #30906

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
784575f
#30900 draft for first changes on force unlock
jdotcms Dec 10, 2024
6bdcd6d
#30900 adding the forze to the checkin actionlet and the lock unlock …
jdotcms Dec 26, 2024
5bf1f2b
#30900 adding the forze to the checkin actionlet and the lock unlock …
jdotcms Dec 26, 2024
17dd337
Merge branch 'main' of github.com:dotCMS/core into issue-30900-adding…
jdotcms Jan 6, 2025
cf8da1e
#30900 adding postmans
jdotcms Jan 6, 2025
a05510a
#30900 adding changes to support the checkbox fine
jdotcms Jan 6, 2025
8415bf2
#30900 adding fixes for the forze lock
jdotcms Jan 7, 2025
455dca1
#30900 adding fixes for the forze lock
jdotcms Jan 7, 2025
8ffe089
Merge branch 'main' into issue-30900-adding-force-unlock
jdotcms Jan 15, 2025
3c2884b
Merge branch 'main' into issue-30900-adding-force-unlock
jdotcms Jan 16, 2025
d727e71
Merge branch 'main' into issue-30900-adding-force-unlock
jdotcms Jan 20, 2025
f81e85f
Merge branch 'main' into issue-30900-adding-force-unlock
jcastro-dotcms Jan 24, 2025
9611344
Fixing Integration Tests.
jcastro-dotcms Jan 24, 2025
7e785a3
Removing code that is commented out
jcastro-dotcms Jan 24, 2025
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
Prev Previous commit
Next Next commit
#30900 adding changes to support the checkbox fine
  • Loading branch information
@jdotcms
jdotcms committed Jan 6, 2025
commit a05510a59effe363275c55bf5a4644543439a15b
2 changes: 1 addition & 1 deletion .../src/main/java/com/dotmarketing/portlets/workflows/actionlet/CheckinContentActionlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public List<WorkflowActionletParameter> getParameters() {

final List<WorkflowActionletParameter> workflowActionletParameters = new ArrayList<>();

workflowActionletParameters.add(new CheckboxWorkflowActionletParameter(FORCE_UNLOCK_ALLOWED, "Force Unlock", "force-unlock", false));
workflowActionletParameters.add(new CheckboxWorkflowActionletParameter(FORCE_UNLOCK_ALLOWED, "Force Unlock", "false", false));

return workflowActionletParameters;
}
Expand Down
5 changes: 2 additions & 3 deletions dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/view_action_class_params.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,9 @@
<tr>
<td nowrap="true" valign="top" style="text-align: right;"><%if(workflowActionletParameter.isRequired()){ %><span class="required"></span><%} %><%=workflowActionletParameter.getDisplayName() %>:</td>
<td>
<%=workflowActionletParameter.getDefaultValue()%> | <%=value%>
<input id="acp-<%=workflowActionletParameter.getKey() %>" name="acp-<%=workflowActionletParameter.getKey() %>" value="<%=workflowActionletParameter.getDefaultValue()%>"
<input id="acp-<%=workflowActionletParameter.getKey() %>" name="acp-<%=workflowActionletParameter.getKey() %>" value="true"
type="checkbox"
<%=workflowActionletParameter.getDefaultValue().equals(value)? "checked":""%> dojoType="dijit.form.CheckBox" />
<%=!workflowActionletParameter.getDefaultValue().equals(value)? "checked":""%> dojoType="dijit.form.CheckBox" />
</td>
</tr>
<% } else { %>
Expand Down
Loading