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

. Bug fix on Forms page of Create Web Project wizard - "Workflow not configured" warning wasn't displaying

Browse Source 
. WCM ContentReviewer bug fix - role can no longer seem Forms (as they cannot create - they can only edit existing items)
. Submit dialog bug fix - can now press OK after entering workflow config when the dialog previous displayed an error

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-01-15 14:08:11 +00:00
parent 74cda67a27
commit 86ef70fedd
4 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -771,8 +771,6 @@ public class CreateWebsiteWizard extends BaseWizardBean
// ------------------------------------------------------------------------------
// Inner classes
/////////////////////////////////////////////////////////////////////////////
/**
* Wrapper class for a configurable template Form instance
*/
@@ -905,7 +903,6 @@ public class CreateWebsiteWizard extends BaseWizardBean
}
}
/////////////////////////////////////////////////////////////////////////////
/**
* Class to represent a single configured Presentation Template instance
@@ -972,7 +969,6 @@ public class CreateWebsiteWizard extends BaseWizardBean
}
}
/////////////////////////////////////////////////////////////////////////////
/**
* Class to represent a single configured Workflow instance
@@ -1074,7 +1070,6 @@ public class CreateWebsiteWizard extends BaseWizardBean
}
}
/////////////////////////////////////////////////////////////////////////////
public class UserWrapper
{
@@ -1104,6 +1099,4 @@ public class CreateWebsiteWizard extends BaseWizardBean
public String getName() { return this.name; }
public String getRole() { return this.role; }
}
/////////////////////////////////////////////////////////////////////////////
}

2
source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
View File

@@ -256,6 +256,8 @@ public class SubmitDialog extends BaseDialogBean
// create error msg for display in dialog - the user must configure the workflow params
Utils.addErrorMessage(Application.getMessage(context, MSG_ERR_WORKFLOW_CONFIG));
outcome = null;
// set the isFinished flag to allow the dialog to be finished again after the error
isFinished = true;
}
}
else

41
source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
View File

@@ -261,6 +261,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
ResourceBundle bundle = Application.getBundle(context);
AVMService avmService = getAVMService(context);
NodeService nodeService = getNodeService(context);
PermissionService permissionService = getPermissionService(context);
UserTransaction tx = null;
try
{
@@ -391,25 +392,31 @@ public class UIUserSandboxes extends SelfRenderingComponent
out.write("</td></tr>");
// content forms panel
out.write("<tr style='padding-top:4px'><td></td><td colspan=2>");
panelImage = WebResources.IMAGE_COLLAPSED;
if (this.expandedPanels.contains(username + PANEL_FORMS))
if (permissionService.hasPermission(
AVMNodeConverter.ToNodeRef(-1, AVMConstants.buildSandboxRootPath(mainStore)),
PermissionService.ADD_CHILDREN) == AccessStatus.ALLOWED)
{
panelImage = WebResources.IMAGE_EXPANDED;
out.write("<tr style='padding-top:4px'><td></td><td colspan=2>");
panelImage = WebResources.IMAGE_COLLAPSED;
if (this.expandedPanels.contains(username + PANEL_FORMS))
{
panelImage = WebResources.IMAGE_EXPANDED;
}
out.write(Utils.buildImageTag(context, panelImage, 11, 11, "",
Utils.generateFormSubmit(context, this, getClientId(context) + PANEL_FORMS, username + PANEL_FORMS)));
out.write("&nbsp;<b>");
out.write(bundle.getString(MSG_CONTENT_FORMS));
out.write("</b>");
if (this.expandedPanels.contains(username + PANEL_FORMS))
{
out.write("<div style='padding:2px'></div>");
// list the content forms for this sandbox user
renderContentForms(context, out, websiteRef, username, storeRoot);
}
out.write("</td></tr>");
}
out.write(Utils.buildImageTag(context, panelImage, 11, 11, "",
Utils.generateFormSubmit(context, this, getClientId(context) + PANEL_FORMS, username + PANEL_FORMS)));
out.write("&nbsp;<b>");
out.write(bundle.getString(MSG_CONTENT_FORMS));
out.write("</b>");
if (this.expandedPanels.contains(username + PANEL_FORMS))
{
out.write("<div style='padding:2px'></div>");
// list the content forms for this sandbox user
renderContentForms(context, out, websiteRef, username, storeRoot);
}
out.write("</td></tr></table>");
out.write("</table>");
// end the outer panel for this sandbox
PanelGenerator.generatePanelEnd(out,