Merged V3.2 to HEAD

18207: Merged DEV/TEMPORARY to V3.2
      17887: ETHREEOH-3853: FF 3.0: Exception after double click on 'Add button'.
      18068: ETHREEOH-3623: Script Error on page "Web Form Details"
      18097: ETHREEOH-3826: System Error occurs on "More Actions" page for a Space after "Edit Details" page for the same Space has been previously opened
      18168: ETHREEOH-3789: Rule with simple workflow moves document to incorrect space
   18238: Fix for ETHREEOH-4000 - WebScript extensions readme.ftl template fixed.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18298 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2010-01-26 12:33:55 +00:00
parent 3f1fc77797
commit 482017a870
4 changed files with 19 additions and 10 deletions

View File

@@ -1280,7 +1280,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
{
UISelectList selectList = (UISelectList)event.getComponent().findComponent(COMPONENT_FORMLIST);
int index = selectList.getRowIndex();
if (index != -1)
if (index != -1 && index < this.formsList.size())
{
Form form = (Form)this.formsList.get(index).getValue();
FormWrapper wrapper = new FormWrapper(form);
@@ -1437,9 +1437,12 @@ public class CreateWebsiteWizard extends BaseWizardBean
{
UISelectList selectList = (UISelectList)event.getComponent().findComponent(COMPONENT_WORKFLOWLIST);
int index = selectList.getRowIndex();
if (index != -1)
List<UIListItem> workflowsList = this.getWorkflowList();
if (index != -1 && index < workflowsList.size())
{
WorkflowDefinition workflow = (WorkflowDefinition)this.getWorkflowList().get(index).getValue();
WorkflowDefinition workflow = (WorkflowDefinition)workflowsList.get(index).getValue();
this.workflows.add(new WorkflowWrapper(
workflow.getName(), workflow.getTitle(), workflow.getDescription(), MATCH_DEFAULT));
}