Merged V3.1 to HEAD

13129: Merged V2.1-A to V3.1
      8598: Fix for ADB-41 (ACT 1657)
   13139: Merged V2.1-A to V3.1
      8674: First phase of using group display name in UI
   13148: Merged V2.1-A to V3.1
      8679: Completion of using group display name in UI
   13149: Merged V2.1-A to V3.1
      8690: Fixed ADB-33 again
   13150: Merged V2.1-A to V3.1
      8775: Fix ACT-2399
   13152: Merged V2.1-A to V3.1
      8941: ACT-2631: added max users message to send email action page

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-11 13:52:31 +00:00
parent cf86bf466c
commit 56ca6373ea
2 changed files with 1 additions and 17 deletions

View File

@@ -15,7 +15,7 @@
</table>
<p>
<table>
<form action="${url.service}" method="post" enctype="multipart/form-data" charset="utf-8">
<form action="${url.service?html}" method="post" enctype="multipart/form-data" charset="utf-8">
<tr><td>File:<td><input type="file" name="file">
<tr><td>Title:<td><input name="title">
<tr><td>Description:<td><input name="desc">

View File

@@ -110,22 +110,6 @@ public class WorkflowInterpreter extends BaseInterpreter
@Override
protected void onBootstrap(ApplicationEvent event)
{
try
{
setCurrentUserName(BaseInterpreter.DEFAULT_ADMIN);
if (!transactionService.isReadOnly())
{
//interpretCommand("var bpm:package package 1"); // only used for testing workflows, causes increment usage/delta
interpretCommand("var bpm:assignee person admin");
}
setCurrentUserName(null);
}
catch(IOException e)
{
throw new WorkflowException("Failed to initialise WorkflowInterpreter", e);
}
}
/* (non-Javadoc)