inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
8265: Added catch blocks for the permissions service access denied exception to various file/folder operations
   8286: Merged V2.1 to V2.2
      8256: Fix broken WCM workflow.
      8257: Partial fix for AWC-1850
      8283: Merged V2.1-A to V2.1
         8264: Fine-grained debug logging for exceptions causing transaction retries.
   8288: Should fix workflow problems. Hard to test since almost nothing works right now.
   8291: Added Peter's fixes to improve deployment start scripts
   8294: Update deploy script from Peter
   8298: Fix for WCM-1058:
   8300: Commented out admin dashlet (active_tasks)
   8359: Fix AR-1735: Customer-requested POI upgrade
   8367: Fix for AWC-1639
   8368: Fix for WCM-1102
   8389: Revert changes between r8072 and r8251 from Schema2XForms.java
   8401: Fix for WCM-1105
   8407: Minor typo fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-10 17:23:01 +00:00
parent 163bb15d5e
commit 6edbb4c266
7 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
View File

@@ -1234,7 +1234,11 @@ public class CreateWebsiteWizard extends BaseWizardBean
this.formsDataModel = new ListDataModel();
}
this.formsDataModel.setWrappedData(this.forms);
// only set the wrapped data once otherwise the row index gets reset
if (this.formsDataModel.getWrappedData() == null)
{
this.formsDataModel.setWrappedData(this.forms);
}
return this.formsDataModel;
}
@@ -1341,7 +1345,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
*/
public void setupWorkflowAction(ActionEvent event)
{
setActionWorkflow( (WorkflowConfiguration)this.workflowsDataModel.getRowData() );
setActionWorkflow( (WorkflowConfiguration)this.getWorkflowsDataModel().getRowData());
}
/**
@@ -1374,7 +1378,11 @@ public class CreateWebsiteWizard extends BaseWizardBean
this.workflowsDataModel = new ListDataModel();
}
this.workflowsDataModel.setWrappedData(this.workflows);
// only set the wrapped data once otherwise the row index gets reset
if (this.workflowsDataModel.getWrappedData() == null)
{
this.workflowsDataModel.setWrappedData(this.workflows);
}
return this.workflowsDataModel;
}