Skip to content

Commit 10c83c0

Browse files
Issue 50356: Remove unused UI that contains usages of javascript: URLs (#69)
1 parent 922759e commit 10c83c0

File tree

6 files changed

+4
-254
lines changed

6 files changed

+4
-254
lines changed

src/org/labkey/workflow/WorkflowController.java

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -173,29 +173,6 @@ public void addNavTrail(NavTree root)
173173
}
174174

175175

176-
@RequiresPermission(ReadPermission.class)
177-
public class StartProcessFormAction extends SimpleViewAction<StartWorkflowProcessForm>
178-
{
179-
@Override
180-
public ModelAndView getView(StartWorkflowProcessForm form, BindException errors) throws Exception
181-
{
182-
WorkflowProcess bean = new WorkflowProcessImpl(form.getProcessDefinitionKey(), form.getWorkflowModelModule());
183-
JspView jsp = new JspView<>("/org/labkey/workflow/view/workflowProcessStart.jsp", bean, errors);
184-
return jsp;
185-
}
186-
187-
@Override
188-
public void validate(StartWorkflowProcessForm form, BindException errors)
189-
{
190-
form.validate(getUser(), getContainer(), errors);
191-
}
192-
193-
@Override
194-
public void addNavTrail(NavTree root)
195-
{
196-
}
197-
}
198-
199176
/**
200177
* Shows a list of tasks that are associated with a particular workflow.
201178
*/
@@ -326,7 +303,7 @@ private String validateProcessDefinitionKey(WorkflowRequestForm form)
326303
* Shows the data about a task if the user has permissions to see this task
327304
*/
328305
@RequiresPermission(ReadPermission.class)
329-
public class TaskAction extends SimpleViewAction<WorkflowTaskForm>
306+
public static class TaskAction extends SimpleViewAction<WorkflowTaskForm>
330307
{
331308
private String _navLabel = "Task details";
332309
private WorkflowTask _task;
@@ -1252,4 +1229,4 @@ public void setModuleName(String moduleName)
12521229
}
12531230
}
12541231

1255-
}
1232+
}

src/org/labkey/workflow/view/WorkflowViewBase.java

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.labkey.api.util.PageFlowUtil;
2828
import org.labkey.api.util.StringUtilsLabKey;
2929
import org.labkey.api.view.ActionURL;
30-
import org.labkey.api.workflow.TaskFormField;
3130
import org.labkey.api.workflow.WorkflowProcess;
3231
import org.labkey.workflow.WorkflowController;
3332

@@ -103,51 +102,6 @@ private Object getParameterValue(String key, Object value)
103102
return value;
104103
}
105104

106-
public String actionForm(String name, String formName, String formAction, Map<String, TaskFormField> fields, @Nullable Map<String, String> hiddenFields)
107-
{
108-
StringBuilder builder = new StringBuilder();
109-
builder.append("<strong>").append(h(name)).append("</strong>");
110-
builder.append("<br><br>\n");
111-
builder.append("<form name=\"").append(h(formName)).append("\" action=\"").append(h(formAction)).append("\">\n");
112-
for (Map.Entry<String, TaskFormField> field : fields.entrySet())
113-
{
114-
// TODO add a type that is text area that has "information" for the rows and columns
115-
// TODO handle other input field types as well: date, long, boolean
116-
if (field.getValue().getType().equals("string"))
117-
{
118-
builder.append(h(field.getValue().getName()));
119-
builder.append("\n<br>\n");
120-
builder.append("<textarea title=\"").append(field.getValue().getName()).append("\" name=\"").append(field.getValue().getId()).append("\" rows=\"10\" cols=\"100\"></textarea>\n<br>\n");
121-
}
122-
else if (field.getValue().getType().equals("enum"))
123-
{
124-
Map<String, String> choices = (Map<String, String>) field.getValue().getInformation("values");
125-
if (choices != null && !choices.isEmpty())
126-
{
127-
builder.append(h(field.getValue().getName()));
128-
builder.append("<select title=\"").append(h(field.getValue().getName())).append("\" name=\"").append(h(field.getValue().getId())).append("\">");
129-
for (Map.Entry<String, String> choice : ((Map<String, String>) field.getValue().getInformation("values")).entrySet())
130-
{
131-
builder.append("<option value=\"").append(h(choice.getKey())).append("\">").append(h(choice.getValue())).append("</option>");
132-
}
133-
builder.append("</select>\n");
134-
builder.append("<br>\n");
135-
}
136-
}
137-
}
138-
if (hiddenFields != null)
139-
{
140-
for (Map.Entry<String, String> hiddenField : hiddenFields.entrySet())
141-
{
142-
builder.append("<input type=\"hidden\" name=\"").append(h(hiddenField.getKey())).append("\" value=\"").append(h(hiddenField.getValue())).append("\" >\n");
143-
}
144-
}
145-
builder.append("<br><br>\n");
146-
builder.append(PageFlowUtil.button("Submit").submit(true));
147-
builder.append("\n</form>\n");
148-
return builder.toString();
149-
}
150-
151105

152106
@Nullable
153107
public Map<String, Object> getDisplayVariables(Container container, Map<String, Object> variables)

src/org/labkey/workflow/view/workflowProcessStart.jsp

Lines changed: 0 additions & 81 deletions
This file was deleted.

src/org/labkey/workflow/view/workflowTask.jsp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
* limitations under the License.
1616
*/
1717
%>
18-
<%@ page import="org.apache.commons.lang3.StringUtils" %>
1918
<%@ page import="org.labkey.api.util.DateUtil" %>
2019
<%@ page import="org.labkey.api.view.HttpView" %>
2120
<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
@@ -146,12 +145,9 @@
146145
<%
147146
}
148147
}
149-
else
150-
{
148+
else {
151149
%>
152-
<%= unsafe(actionForm(bean.getName(), bean.getTaskDefinitionKey(),
153-
"javascript:completeWorkflowTask(" + q(bean.getId()) + "," + qh(bean.getTaskDefinitionKey()) + ", ['" + StringUtils.join(fields.keySet(), "', '") + "']," + q(bean.getProcessInstanceId()) + ", " + qh(bean.getProcessDefinitionKey(getContainer())) + ")", fields, null)) %>
154-
<br>
150+
<div>Unsupported in UI</div>
155151
<%
156152
}
157153
}

test/src/org/labkey/test/pages/workflow/WorkflowTask.java

Lines changed: 0 additions & 52 deletions
This file was deleted.

webapp/workflow/view/startProcess.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)