diff --git a/config/alfresco/web-client-config-workflow-actions.xml b/config/alfresco/web-client-config-workflow-actions.xml
index 8832d174cf..9e2b743244 100644
--- a/config/alfresco/web-client-config-workflow-actions.xml
+++ b/config/alfresco/web-client-config-workflow-actions.xml
@@ -17,9 +17,10 @@
manage_task
/images/icons/manage_workflow_task.gif
dialog:manageTask
- #{DialogManager.setupParameters}
+ #{WorkflowBean.setupTaskDialog}
#{actionContext.id}
+ #{actionContext.type}
@@ -27,9 +28,10 @@
view_completed_task_title
/images/icons/view_workflow_task.gif
dialog:viewCompletedTask
- #{DialogManager.setupParameters}
+ #{WorkflowBean.setupTaskDialog}
#{actionContext.id}
+ #{actionContext.type}
@@ -37,9 +39,10 @@
reassign
/images/icons/reassign_task.gif
dialog:reassignTask
- #{DialogManager.setupParameters}
+ #{WorkflowBean.setupTaskDialog}
#{actionContext.id}
+ #{actionContext.type}
diff --git a/source/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java b/source/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java
index 947c030572..f5e0b588d4 100644
--- a/source/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java
@@ -21,6 +21,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.web.action.ActionEvaluator;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Node;
@@ -50,7 +51,8 @@ public class EditDocCIFSEvaluator implements ActionEvaluator
"cifs".equals(Application.getClientConfig(fc).getEditLinkType()))
{
if (node.isWorkingCopyOwner() == true ||
- (node.isLocked() == false && node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false))
+ (node.hasAspect(ContentModel.ASPECT_WORKING_COPY) && node.hasPermission(PermissionService.WRITE)) ||
+ (node.isLocked() == false && node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false))
{
result = true;
}
diff --git a/source/java/org/alfresco/web/action/evaluator/EditDocHttpEvaluator.java b/source/java/org/alfresco/web/action/evaluator/EditDocHttpEvaluator.java
index f56704814a..e64b4d3f29 100644
--- a/source/java/org/alfresco/web/action/evaluator/EditDocHttpEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/EditDocHttpEvaluator.java
@@ -21,6 +21,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.web.action.ActionEvaluator;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Node;
@@ -50,8 +51,9 @@ public class EditDocHttpEvaluator implements ActionEvaluator
if (node.hasAspect(ApplicationModel.ASPECT_INLINEEDITABLE) == true ||
"http".equals(Application.getClientConfig(fc).getEditLinkType()))
{
- if (node.isWorkingCopyOwner() == true ||
- (node.isLocked() == false && node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false))
+ if (node.isWorkingCopyOwner() == true ||
+ (node.hasAspect(ContentModel.ASPECT_WORKING_COPY) && node.hasPermission(PermissionService.WRITE)) ||
+ (node.isLocked() == false && node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false))
{
result = true;
}
diff --git a/source/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java b/source/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java
index 1f15de1c84..f3f107bbca 100644
--- a/source/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java
@@ -21,6 +21,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.web.action.ActionEvaluator;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Node;
@@ -50,7 +51,8 @@ public class EditDocWebDavEvaluator implements ActionEvaluator
"webdav".equals(Application.getClientConfig(fc).getEditLinkType()))
{
if (node.isWorkingCopyOwner() == true ||
- (node.isLocked() == false && node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false))
+ (node.hasAspect(ContentModel.ASPECT_WORKING_COPY) && node.hasPermission(PermissionService.WRITE)) ||
+ (node.isLocked() == false && node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false))
{
result = true;
}
diff --git a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
index 8130da7ad0..3dc4eb9efe 100644
--- a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
+++ b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
@@ -26,7 +26,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.config.Config;
import org.alfresco.config.ConfigService;
-import org.alfresco.web.app.servlet.ExternalAccessServlet;
+import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.NavigationBean;
import org.alfresco.web.bean.dialog.DialogManager;
import org.alfresco.web.bean.dialog.DialogState;
@@ -121,6 +121,13 @@ public class AlfrescoNavigationHandler extends NavigationHandler
}
}
+ // reset the dispatch context
+ Object bean = FacesHelper.getManagedBean(context, CONFIG_NAV_BEAN);
+ if (bean instanceof NavigationBean)
+ {
+ ((NavigationBean)bean).resetDispatchContext();
+ }
+
if (logger.isDebugEnabled())
logger.debug("view stack: " + getViewStack(context));
}
@@ -659,28 +666,14 @@ public class AlfrescoNavigationHandler extends NavigationHandler
}
else
{
- // the details pages can be loaded via the external access servlet,
- // if this is the case the details page would not have been loaded as
- // a dialog, in this scenario just use the global "browse" outcome.
- String referer = (String)context.getExternalContext().
- getRequestHeaderMap().get("referer");
- if ((referer != null) &&
- ((referer.indexOf(ExternalAccessServlet.OUTCOME_DOCDETAILS) != -1) ||
- (referer.indexOf(ExternalAccessServlet.OUTCOME_SPACEDETAILS) != -1)))
+ // we are trying to close a dialog when one hasn't been opened!
+ // return to the main page of the app (print warning if debug is enabled)
+ if (logger.isDebugEnabled())
{
- navigate(context, fromAction, "browse");
- }
- else
- {
- // we are trying to close a dialog when one hasn't been opened!
- // log a warning and return a null outcome to stay on the same page
- if (logger.isWarnEnabled())
- {
- logger.warn("Attempting to close a " + closingItem + " with an empty view stack, returning null outcome");
- }
-
- navigate(context, fromAction, null);
+ logger.debug("Attempting to close a " + closingItem + " with an empty view stack, returning 'browse' outcome");
}
+
+ navigate(context, fromAction, "browse");
}
}
diff --git a/source/java/org/alfresco/web/bean/repository/TransientNode.java b/source/java/org/alfresco/web/bean/repository/TransientNode.java
index 337cbc05d3..0588c4e6af 100644
--- a/source/java/org/alfresco/web/bean/repository/TransientNode.java
+++ b/source/java/org/alfresco/web/bean/repository/TransientNode.java
@@ -251,7 +251,7 @@ public class TransientNode extends Node
TypeDefinition typeDef = ddService.getType(this.type);
if (typeDef == null)
{
- throw new AlfrescoRuntimeException("Failed to find type definition for start task: " + this.type);
+ throw new AlfrescoRuntimeException("Failed to find type definition: " + this.type);
}
this.aspects = new HashSet();
diff --git a/source/java/org/alfresco/web/bean/repository/User.java b/source/java/org/alfresco/web/bean/repository/User.java
index 1a3b4d38ec..1a05a0df8a 100644
--- a/source/java/org/alfresco/web/bean/repository/User.java
+++ b/source/java/org/alfresco/web/bean/repository/User.java
@@ -229,7 +229,7 @@ public final class User
Map props = nodeService.getProperties(user);
String firstName = (String)props.get(ContentModel.PROP_FIRSTNAME);
String lastName = (String)props.get(ContentModel.PROP_LASTNAME);
- String fullName = firstName + " " + (lastName != null ? lastName : "");
+ String fullName = firstName + ((lastName != null && lastName.length() > 0) ? " " + lastName : "");
return fullName;
}
diff --git a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
index 15e857f0b4..9cd04d9026 100644
--- a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
+++ b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
@@ -460,16 +460,18 @@ public class CreateSpaceWizard extends BaseWizardBean
FacesContext context = FacesContext.getCurrentInstance();
String xpath = Application.getRootPath(context) + "/" + Application.getGlossaryFolderName(context) +
"/" + Application.getSpaceTemplatesFolderName(context) + "/*";
- NodeRef rootNodeRef = this.nodeService.getRootNode(Repository.getStoreRef());
- NamespaceService resolver = Repository.getServiceRegistry(context).getNamespaceService();
- List results = this.searchService.selectNodes(rootNodeRef, xpath, null, resolver, false);
+ NodeRef rootNodeRef = this.nodeService.getRootNode(Repository.getStoreRef());
+ List results = this.searchService.selectNodes(rootNodeRef, xpath, null, this.namespaceService, false);
if (results.size() > 0)
{
for (NodeRef assocRef : results)
{
Node childNode = new Node(assocRef);
- this.templates.add(new SelectItem(childNode.getId(), childNode.getName()));
+ if (this.dictionaryService.isSubClass(childNode.getType(), ContentModel.TYPE_FOLDER))
+ {
+ this.templates.add(new SelectItem(childNode.getId(), childNode.getName()));
+ }
}
// make sure the list is sorted by the label
diff --git a/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java b/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
index c65487c76e..6424b07ec0 100644
--- a/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
+++ b/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
@@ -532,6 +532,22 @@ public class StartWorkflowWizard extends BaseWizardBean
return availableWorkflows;
}
+ /**
+ * Returns the URL to the Workflow Definition Image of the current task
+ *
+ * @return the url
+ */
+ public String getWorkflowDefinitionImageUrl()
+ {
+ String url = null;
+ if (selectedWorkflow != null)
+ {
+ WorkflowDefinition def = workflows.get(selectedWorkflow);
+ url = "/workflowdefinitionimage/" + def.id;
+ }
+ return url;
+ }
+
/**
* Returns a list of resources associated with this task
* i.e. the children of the workflow package
diff --git a/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java b/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java
index eca548a8ed..fc079cd88a 100644
--- a/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java
+++ b/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java
@@ -2,8 +2,10 @@ package org.alfresco.web.bean.workflow;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
import javax.transaction.UserTransaction;
import org.alfresco.model.ContentModel;
@@ -14,13 +16,17 @@ import org.alfresco.service.cmr.workflow.WorkflowTask;
import org.alfresco.service.cmr.workflow.WorkflowTaskDefinition;
import org.alfresco.service.cmr.workflow.WorkflowTaskState;
import org.alfresco.service.cmr.workflow.WorkflowTransition;
+import org.alfresco.service.namespace.QName;
import org.alfresco.util.ISO9075;
import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.NavigationBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.bean.repository.TransientMapNode;
+import org.alfresco.web.bean.repository.TransientNode;
import org.alfresco.web.bean.repository.User;
import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIActionLink;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,6 +37,7 @@ import org.apache.commons.logging.LogFactory;
*/
public class WorkflowBean
{
+ protected NavigationBean navigationBean;
protected NodeService nodeService;
protected WorkflowService workflowService;
protected List tasks;
@@ -141,6 +148,16 @@ public class WorkflowBean
return this.completedTasks;
}
+ /**
+ * Sets the navigation bean to use
+ *
+ * @param navigationBean The NavigationBean to set.
+ */
+ public void setNavigationBean(NavigationBean navigationBean)
+ {
+ this.navigationBean = navigationBean;
+ }
+
/**
* Sets the workflow service to use
*
@@ -161,6 +178,24 @@ public class WorkflowBean
this.nodeService = nodeService;
}
+ // ------------------------------------------------------------------------------
+ // Navigation handlers
+
+ public void setupTaskDialog(ActionEvent event)
+ {
+ UIActionLink link = (UIActionLink)event.getComponent();
+ Map params = link.getParameterMap();
+ String id = params.get("id");
+ String type = params.get("type");
+
+ // setup the dispatch context with the task we're opening a dialog for
+ TransientNode node = new TransientNode(QName.createQName(type), id, null);
+ this.navigationBean.setupDispatchContext(node);
+
+ // pass on parameters for the dialog
+ Application.getDialogManager().setupParameters(event);
+ }
+
// ------------------------------------------------------------------------------
// Helper methods
@@ -181,7 +216,7 @@ public class WorkflowBean
// add properties for the other useful metadata
node.getProperties().put(ContentModel.PROP_NAME.toString(), task.title);
- node.getProperties().put("type", taskDef.metadata.getTitle());
+ node.getProperties().put("type", node.getType().toString());
node.getProperties().put("id", task.id);
// add extra properties for completed tasks
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index 5a274e64fe..21658d89ef 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -2856,6 +2856,2164 @@
nameMatcher
#{globalPathExcluder}
+
+ personService
+ #{PersonService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ userPreferencesBean
+ #{UserPreferencesBean}
+
+
+
+
+
+ The bean that holds navigation state.
+
+ NavigationBean
+ org.alfresco.web.bean.NavigationBean
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ searchService
+ #{SearchService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+ cifsServer
+ #{cifsServer}
+
+
+ ruleService
+ #{RuleService}
+
+
+ userPreferencesBean
+ #{UserPreferencesBean}
+
+
+
+
+
+ The bean that holds folder browse state.
+
+ BrowseBean
+ org.alfresco.web.bean.BrowseBean
+ session
+
+ navigator
+ #{NavigationBean}
+
+
+ nodeService
+ #{NodeService}
+
+
+ searchService
+ #{SearchService}
+
+
+ lockService
+ #{LockService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+
+
+ Bean that provides information for the About page
+ AboutBean
+ org.alfresco.web.bean.AboutBean
+ session
+
+ descriptorService
+ #{DescriptorService}
+
+
+
+
+ Bean that manages the dialog framework
+ DialogManager
+ org.alfresco.web.bean.dialog.DialogManager
+ session
+
+
+
+ Bean that manages the wizard framework
+ WizardManager
+ org.alfresco.web.bean.wizard.WizardManager
+ session
+
+
+
+
+ The bean that backs up the Create Space Dialog
+
+ CreateSpaceDialog
+ org.alfresco.web.bean.spaces.CreateSpaceDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that backs up the Create Space Wizard
+
+ CreateSpaceWizard
+ org.alfresco.web.bean.spaces.CreateSpaceWizard
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that backs up the Delete Space Dialog
+
+ DeleteSpaceDialog
+ org.alfresco.web.bean.spaces.DeleteSpaceDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that holds a users Clipboard state.
+
+ ClipboardBean
+ org.alfresco.web.bean.clipboard.ClipboardBean
+ session
+
+ navigator
+ #{NavigationBean}
+
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ copyService
+ #{CopyService}
+
+
+ searchService
+ #{SearchService}
+
+
+
+
+
+ The bean that manages the state for the Recent Spaces Shelf component.
+
+ RecentSpacesBean
+ org.alfresco.web.bean.RecentSpacesBean
+ session
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+
+
+
+ The bean that manages the state for the User Shortcuts Shelf component.
+
+ UserShortcutsBean
+ org.alfresco.web.bean.UserShortcutsBean
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ permissionService
+ #{PermissionService}
+
+
+
+
+
+ The bean that holds a state for the Advanced Search screen.
+
+ AdvancedSearchBean
+ org.alfresco.web.bean.AdvancedSearchBean
+ session
+
+ navigator
+ #{NavigationBean}
+
+
+ nodeService
+ #{NodeService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+ searchService
+ #{SearchService}
+
+
+ permissionService
+ #{PermissionService}
+
+
+
+
+
+ The bean that holds state for the Users screen.
+
+ UsersBean
+ org.alfresco.web.bean.users.UsersBean
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ searchService
+ #{SearchService}
+
+
+ authenticationService
+ #{AuthenticationService}
+
+
+ personService
+ #{PersonService}
+
+
+
+
+
+ The bean that holds state for the Groups Management screens.
+
+ GroupsBean
+ org.alfresco.web.bean.GroupsBean
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ authorityService
+ #{AuthorityService}
+
+
+ personService
+ #{PersonService}
+
+
+
+
+
+ The bean that holds state for the Category Management screens.
+
+ CategoriesBean
+ org.alfresco.web.bean.CategoriesBean
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ categoryService
+ #{CategoryService}
+
+
+
+
+
+ The bean that backs up the Edit Space Dialog
+
+ EditSpaceDialog
+ org.alfresco.web.bean.spaces.EditSpaceDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ searchService
+ #{SearchService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that backs up the Add Content Dialog
+
+ AddContentDialog
+ org.alfresco.web.bean.content.AddContentDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ contentService
+ #{ContentService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+
+
+
+ The bean that backs up the Create Content Wizard
+
+ CreateContentWizard
+ org.alfresco.web.bean.content.CreateContentWizard
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ contentService
+ #{ContentService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+
+
+
+ The bean that backs up the View Content Properties Dialog
+
+ ViewContentPropertiesDialog
+ org.alfresco.web.bean.content.ViewContentPropertiesDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+
+
+
+ The bean that backs up the Set Content Properties Dialog
+
+ SetContentPropertiesDialog
+ org.alfresco.web.bean.content.SetContentPropertiesDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+
+
+
+ The bean that backs up the Edit Content Properties Dialog
+
+ EditContentPropertiesDialog
+ org.alfresco.web.bean.content.EditContentPropertiesDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+
+
+
+ The bean that backs up the Delete Content Dialog
+
+ DeleteContentDialog
+ org.alfresco.web.bean.content.DeleteContentDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that backs up the Link Properties Dialog
+
+ LinkPropertiesBean
+ org.alfresco.web.bean.LinkPropertiesBean
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ navigator
+ #{NavigationBean}
+
+
+
+
+
+ The bean that backs up the Create Rule Wizard
+
+ CreateRuleWizard
+ org.alfresco.web.bean.rules.CreateRuleWizard
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ ruleService
+ #{RuleService}
+
+
+ actionService
+ #{ActionService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ mimetypeService
+ #{MimetypeService}
+
+
+ rulesBean
+ #{RulesBean}
+
+
+ personService
+ #{PersonService}
+
+
+ authorityService
+ #{AuthorityService}
+
+
+
+
+
+ The bean that backs up the Edit Rule Wizard
+
+ EditRuleWizard
+ org.alfresco.web.bean.rules.EditRuleWizard
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ ruleService
+ #{RuleService}
+
+
+ actionService
+ #{ActionService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ mimetypeService
+ #{MimetypeService}
+
+
+ rulesBean
+ #{RulesBean}
+
+
+ personService
+ #{PersonService}
+
+
+ authorityService
+ #{AuthorityService}
+
+
+
+
+
+ The bean that backs up the Run Action Wizard
+
+ RunActionWizard
+ org.alfresco.web.bean.actions.RunActionWizard
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ actionService
+ #{ActionService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ mimetypeService
+ #{MimetypeService}
+
+
+ personService
+ #{PersonService}
+
+
+ authorityService
+ #{AuthorityService}
+
+
+
+
+
+ The bean that backs up the New User Wizard
+
+ NewUserWizard
+ org.alfresco.web.bean.wizard.NewUserWizard
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ authenticationService
+ #{authenticationService}
+
+
+ permissionService
+ #{PermissionService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+ personService
+ #{PersonService}
+
+
+ ownableService
+ #{OwnableService}
+
+
+
+
+
+ The bean that backs up the Manage Invited Users screens
+
+ SpaceUsersBean
+ org.alfresco.web.bean.users.SpaceUsersBean
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ searchService
+ #{SearchService}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ permissionService
+ #{PermissionService}
+
+
+ ownableService
+ #{OwnableService}
+
+
+ personService
+ #{PersonService}
+
+
+
+
+
+ The bean that backs up the Manage Content Users screens
+
+ ContentUsersBean
+ org.alfresco.web.bean.users.ContentUsersBean
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ searchService
+ #{SearchService}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ permissionService
+ #{PermissionService}
+
+
+ ownableService
+ #{OwnableService}
+
+
+ personService
+ #{PersonService}
+
+
+
+
+
+ The bean that backs up the Invite Users Wizard
+
+ InviteSpaceUsersWizard
+ org.alfresco.web.bean.wizard.InviteSpaceUsersWizard
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ searchService
+ #{SearchService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+ permissionService
+ #{PermissionService}
+
+
+ personService
+ #{PersonService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ mailSender
+ #{mailService}
+
+
+ authorityService
+ #{AuthorityService}
+
+
+
+
+
+ The bean that backs up the Invite Content Users Wizard
+
+ InviteContentUsersWizard
+ org.alfresco.web.bean.wizard.InviteContentUsersWizard
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ searchService
+ #{SearchService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+ permissionService
+ #{PermissionService}
+
+
+ personService
+ #{PersonService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ mailSender
+ #{mailService}
+
+
+ authorityService
+ #{AuthorityService}
+
+
+
+
+
+ The bean that backs up the Checkin and Checkout pages.
+
+ CheckinCheckoutBean
+ org.alfresco.web.bean.CheckinCheckoutBean
+ session
+
+ browseBean
+ #{BrowseBean}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ nodeService
+ #{NodeService}
+
+
+ versionOperationsService
+ #{CheckoutCheckinService}
+
+
+ contentService
+ #{ContentService}
+
+
+ workflowService
+ #{WorkflowService}
+
+
+
+
+
+ The bean that holds manage content rules state
+
+ RulesBean
+ org.alfresco.web.bean.rules.RulesBean
+ session
+
+ browseBean
+ #{BrowseBean}
+
+
+ ruleService
+ #{RuleService}
+
+
+ actionService
+ #{ActionService}
+
+
+ nodeService
+ #{NodeService}
+
+
+
+
+
+ Backing bean used by the document details dialog
+
+ DocumentDetailsBean
+ org.alfresco.web.bean.DocumentDetailsBean
+ session
+
+ browseBean
+ #{BrowseBean}
+
+
+ nodeService
+ #{NodeService}
+
+
+ lockService
+ #{LockService}
+
+
+ versionService
+ #{VersionService}
+
+
+ copyService
+ #{CopyService}
+
+
+ ownableService
+ #{OwnableService}
+
+
+ checkOutCheckInService
+ #{CheckoutCheckinService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+
+
+
+ Backing bean used by the Space details dialog
+
+ SpaceDetailsBean
+ org.alfresco.web.bean.SpaceDetailsBean
+ session
+
+ browseBean
+ #{BrowseBean}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ nodeService
+ #{NodeService}
+
+
+ permissionService
+ #{PermissionService}
+
+
+ ownableService
+ #{OwnableService}
+
+
+ copyService
+ #{CopyService}
+
+
+
+
+
+ Backing bean used by screens requiring access to lists of Templates
+
+ TemplateSupportBean
+ org.alfresco.web.bean.TemplateSupportBean
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ searchService
+ #{SearchService}
+
+
+
+
+
+ Backing bean used by the document preview dialog
+
+ DocumentPreviewBean
+ org.alfresco.web.bean.preview.DocumentPreviewBean
+ session
+
+ browseBean
+ #{BrowseBean}
+
+
+ navigator
+ #{NavigationBean}
+
+
+
+
+
+ Backing bean used by the document preview dialog
+
+ SpacePreviewBean
+ org.alfresco.web.bean.preview.SpacePreviewBean
+ session
+
+ browseBean
+ #{BrowseBean}
+
+
+ navigator
+ #{NavigationBean}
+
+
+
+
+ Backing bean used for the Export dialog
+ ExportDialog
+ org.alfresco.web.bean.ExportBean
+ session
+
+ browseBean
+ #{BrowseBean}
+
+
+ nodeService
+ #{NodeService}
+
+
+ actionService
+ #{ActionService}
+
+
+
+
+ Backing bean used for the Import dialog
+ ImportDialog
+ org.alfresco.web.bean.ImportBean
+ session
+
+ browseBean
+ #{BrowseBean}
+
+
+ nodeService
+ #{NodeService}
+
+
+ actionService
+ #{ActionService}
+
+
+ contentService
+ #{ContentService}
+
+
+
+
+
+ Backing bean used for the low-level Node Browser
+ AdminNodeBrowseBean
+ org.alfresco.web.bean.AdminNodeBrowseBean
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ searchService
+ #{SearchService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+ permissionService
+ #{PermissionService}
+
+
+
+
+
+
+ The bean that holds forums state.
+
+ ForumsBean
+ org.alfresco.web.bean.forums.ForumsBean
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ contentService
+ #{ContentService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ searchService
+ #{SearchService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that backs up the Create Forums Dialog
+
+ CreateForumsDialog
+ org.alfresco.web.bean.forums.CreateForumsDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that backs up the Create Forum Dialog
+
+ CreateForumDialog
+ org.alfresco.web.bean.forums.CreateForumDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ searchService
+ #{SearchService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that backs up the Create Topic Dialog
+
+ CreateTopicDialog
+ org.alfresco.web.bean.forums.CreateTopicDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ contentService
+ #{ContentService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that backs up the Create Post Dialog
+
+ CreatePostDialog
+ org.alfresco.web.bean.forums.CreatePostDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ contentService
+ #{ContentService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+
+
+
+ The bean that backs up the Edit Post Dialog
+
+ EditPostDialog
+ org.alfresco.web.bean.forums.EditPostDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ contentService
+ #{ContentService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+
+
+
+ The bean that backs up the Create Reply Dialog
+
+ CreateReplyDialog
+ org.alfresco.web.bean.forums.CreateReplyDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ contentService
+ #{ContentService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+
+
+
+ The bean that backs up the Create Discussion Dialog
+
+ CreateDiscussionDialog
+ org.alfresco.web.bean.forums.CreateDiscussionDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ contentService
+ #{ContentService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that backs up the Delete Forum Space Dialog
+
+ DeleteForumsDialog
+ org.alfresco.web.bean.forums.DeleteForumsDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that backs up the Delete Forum Dialog
+
+ DeleteForumDialog
+ org.alfresco.web.bean.forums.DeleteForumDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that backs up the Delete Topic Dialog
+
+ DeleteTopicDialog
+ org.alfresco.web.bean.forums.DeleteTopicDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that backs up the Delete Post Dialog
+
+ DeletePostDialog
+ org.alfresco.web.bean.forums.DeletePostDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+
+
+
+ The bean that holds state for the Manage Deleted Items screen.
+
+ TrashcanBean
+ org.alfresco.web.bean.TrashcanBean
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ nodeArchiveService
+ #{nodeArchiveService}
+
+
+ searchService
+ #{SearchService}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+
+
+
+ Helper bean that caches the last item added to a multi
+ value editor component
+
+ MultiValueEditorBean
+ org.alfresco.web.bean.MultiValueEditorBean
+ session
+
+
+
+ Bean that manages the Dashboard framework
+ DashboardManager
+ org.alfresco.web.bean.dashboard.DashboardManager
+ session
+
+
+
+
+ The bean that backs up the Dashboard Config Wizard
+
+ DashboardWizard
+ org.alfresco.web.bean.dashboard.DashboardWizard
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ dashboardManager
+ #{DashboardManager}
+
+
+
+
+
+ The bean that backs up the Manage Task Dialog
+
+ ManageTaskDialog
+ org.alfresco.web.bean.workflow.ManageTaskDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+ workflowService
+ #{WorkflowService}
+
+
+
+
+
+ The bean that backs up the View Completed Task Dialog
+
+ ViewCompletedTaskDialog
+ org.alfresco.web.bean.workflow.ViewCompletedTaskDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+ workflowService
+ #{WorkflowService}
+
+
+
+
+ StartWorkflowWizard
+ org.alfresco.web.bean.workflow.StartWorkflowWizard
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+ workflowService
+ #{WorkflowService}
+
+
+
+
+
+ The bean that backs up the Cancel Workflow Dialog
+
+ CancelWorkflowDialog
+ org.alfresco.web.bean.workflow.CancelWorkflowDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+ workflowService
+ #{WorkflowService}
+
+
+
+
+
+ The bean that backs up the Reassign Task Dialog
+
+ ReassignTaskDialog
+ org.alfresco.web.bean.workflow.ReassignTaskDialog
+ session
+
+ nodeService
+ #{NodeService}
+
+
+ fileFolderService
+ #{FileFolderService}
+
+
+ searchService
+ #{SearchService}
+
+
+ navigator
+ #{NavigationBean}
+
+
+ browseBean
+ #{BrowseBean}
+
+
+ dictionaryService
+ #{DictionaryService}
+
+
+ namespaceService
+ #{NamespaceService}
+
+
+ workflowService
+ #{WorkflowService}
+
+
+ personService
+ #{PersonService}
+
+
+
+
+ WorkflowBean
+ org.alfresco.web.bean.workflow.WorkflowBean
+ request
+
+ navigationBean
+ #{NavigationBean}
+
+
+ nodeService
+ #{NodeService}
+
+
+ workflowService
+ #{WorkflowService}
+
+
+
+
+
+ Backing bean used for the Workflow Console
+ WorkflowConsoleBean
+ org.alfresco.web.bean.workflow.WorkflowConsoleBean
+ session
+
+ workflowInterpreter
+ #{workflowInterpreter}
+
+
+
+
+
+ The bean that backs up the Email Space Users Dialog
+
+ EmailSpaceUsersDialog
+ org.alfresco.web.bean.users.EmailSpaceUsersDialog
+ session
+
+ browseBean
+ #{BrowseBean}
+
+
+ nodeService
+ #{NodeService}
+
+
+ permissionService
+ #{PermissionService}
+
+
+ personService
+ #{PersonService}
+
+
+ authorityService
+ #{AuthorityService}
+
+
+ mailSender
+ #{mailService}
+
+
+
+
+
+ The bean that backs up the Getting Started Dashlet page
+
+ GettingStartedBean
+ org.alfresco.web.bean.dashboard.GettingStartedBean
+ session
+
+ navigationBean
+ #{NavigationBean}
+
+
+
+
+
+ The bean that backs up the User Preferences page
+
+ UserPreferencesBean
+ org.alfresco.web.bean.UserPreferencesBean
+ session
+
+
+
+
+
+
+ Bean that generates a text field component
+
+ TextFieldGenerator
+ org.alfresco.web.bean.generator.TextFieldGenerator
+ request
+
+
+
+
+
+ Bean that generates a text area component
+
+ TextAreaGenerator
+ org.alfresco.web.bean.generator.TextAreaGenerator
+ request
+
+
+
+
+
+ Bean that generates a checkbox component
+
+ CheckboxGenerator
+ org.alfresco.web.bean.generator.CheckboxGenerator
+ request
+
+
+
+
+ Bean that generates a date picker component
+
+ DatePickerGenerator
+ org.alfresco.web.bean.generator.DatePickerGenerator
+ request
+
+
+
+
+
+ Bean that generates a datetime picker component
+
+ DateTimePickerGenerator
+ org.alfresco.web.bean.generator.DateTimePickerGenerator
+ request
+
+
+
+
+
+ Bean that generates a label component
+
+ LabelGenerator
+ org.alfresco.web.bean.generator.LabelGenerator
+ request
+
+
+
+
+ Bean that generates a mime type selector component
+
+ MimeTypeSelectorGenerator
+ org.alfresco.web.bean.generator.MimeTypeSelectorGenerator
+ request
+
+
+
+
+ Bean that generates an image picker component
+
+ SpaceIconPickerGenerator
+ org.alfresco.web.bean.generator.SpaceIconPickerGenerator
+ request
+
+
+
+
+ Bean that generates a category selector component
+
+ CategorySelectorGenerator
+ org.alfresco.web.bean.generator.CategorySelectorGenerator
+ request
+
+
+
+
+ Bean that generates an association component
+
+ AssociationGenerator
+ org.alfresco.web.bean.generator.AssociationGenerator
+ request
+
+
+
+
+ Bean that generates a child association component
+
+ ChildAssociationGenerator
+ org.alfresco.web.bean.generator.ChildAssociationGenerator
+ request
diff --git a/source/web/jsp/dialog/rules.jsp b/source/web/jsp/dialog/rules.jsp
index e6ed79ef71..0c76b0b214 100644
--- a/source/web/jsp/dialog/rules.jsp
+++ b/source/web/jsp/dialog/rules.jsp
@@ -150,7 +150,7 @@
<%-- Primary column for details view mode --%>
diff --git a/source/web/jsp/workflow/start-workflow-wizard/workflow-options.jsp b/source/web/jsp/workflow/start-workflow-wizard/workflow-options.jsp
index 9f36d82e5b..2328b89a84 100644
--- a/source/web/jsp/workflow/start-workflow-wizard/workflow-options.jsp
+++ b/source/web/jsp/workflow/start-workflow-wizard/workflow-options.jsp
@@ -136,7 +136,7 @@
-
+
\ No newline at end of file
diff --git a/source/web/jsp/workflow/tasks-completed-dashlet.jsp b/source/web/jsp/workflow/tasks-completed-dashlet.jsp
index 49245d5c8e..9baac8e505 100644
--- a/source/web/jsp/workflow/tasks-completed-dashlet.jsp
+++ b/source/web/jsp/workflow/tasks-completed-dashlet.jsp
@@ -18,13 +18,15 @@
+ actionListener="#{WorkflowBean.setupTaskDialog}" action="dialog:viewCompletedTask">
+
-
+
diff --git a/source/web/jsp/workflow/tasks-todo-dashlet.jsp b/source/web/jsp/workflow/tasks-todo-dashlet.jsp
index a225ec347e..31e6efb96f 100644
--- a/source/web/jsp/workflow/tasks-todo-dashlet.jsp
+++ b/source/web/jsp/workflow/tasks-todo-dashlet.jsp
@@ -18,13 +18,15 @@
+ actionListener="#{WorkflowBean.setupTaskDialog}" action="dialog:manageTask">
+
-
+