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 V3.2 to HEAD

Browse Source 
17075: Merged DEV-TEMPORARY to V3.2
      16768: ETHREEOH-2359: System Error message appears while clicking "View Completed Task" icon for the task, if the user, whom the Adhoc task was assigned to, has been deleted
      16792: *RECORD ONLY* ETHREEOH-1429: Unfriendly error occurs when two content managers create identical content items in appropriate user sandboxes
   17078: Merged DEV-TEMPORARY to V3.2
      16962: ETHREEOH-1289: It is possible to add one Web Form to Web Project twice and more times
   17080: Merged DEV-TEMPORARY to V3.2
      16960: ETHREEOH-1894: Unfriendly notifications appear when trying to edit unlocked content

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-10-22 10:17:12 +00:00
parent a118bd2e94
commit d5fa19de9f
4 changed files with 70 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1223,7 +1223,19 @@ public class CreateWebsiteWizard extends BaseWizardBean
item.setLabel(form.getTitle());
item.setDescription(form.getDescription());
item.setImage(WebResources.IMAGE_WEBFORM_32);
items.add(item);
boolean skip = false;
for (FormWrapper formWrapper : this.forms)
{
if (formWrapper.getTitle().equals(form.getTitle()))
{
skip = true;
break;
}
}
if (!skip)
{
items.add(item);
}
}
this.formsList = items;
return items;
@@ -1368,9 +1380,21 @@ public class CreateWebsiteWizard extends BaseWizardBean
item.setLabel(workflowDef.title);
item.setDescription(workflowDef.description);
item.setImage(WebResources.IMAGE_WORKFLOW_32);
items.add(item);
boolean skip = false;
for (WorkflowWrapper workflowWrapper : this.workflows)
{
if (workflowWrapper.getTitle().equals(workflowDef.getTitle()))
{
skip = true;
break;
}
}
if (!skip)
{
items.add(item);
}
}
return items;
}