diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml index 42e719d313..4374894265 100644 --- a/config/alfresco/web-client-config-dialogs.xml +++ b/config/alfresco/web-client-config-dialogs.xml @@ -125,6 +125,14 @@ + + + + + + + delete + /images/icons/delete.gif + #{AVMBrowseBean.setupContentAction} + dialog:deleteAvmFileBrowse + + #{actionContext.path} + + + delete @@ -35,6 +46,17 @@ + + + delete + /images/icons/delete.gif + #{AVMBrowseBean.setupContentAction} + dialog:deleteAvmFolderBrowse + + #{actionContext.path} + + + submit @@ -124,7 +146,7 @@ - + @@ -132,7 +154,7 @@ false - + @@ -179,13 +201,13 @@ false - + false - + diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml index bdf3677542..cc08dbba01 100644 --- a/config/alfresco/web-client-config.xml +++ b/config/alfresco/web-client-config.xml @@ -67,7 +67,7 @@ alfresco@alfresco.org - localdomain.lan + alfresco.dyndns.org 8180 diff --git a/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java b/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java index 1d9f54b31a..4b65439662 100644 --- a/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java +++ b/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java @@ -69,16 +69,17 @@ public class EditContentPropertiesDialog extends BaseDialogBean NodeRef nodeRef = this.editableNode.getNodeRef(); Map editedProps = this.editableNode.getProperties(); - // get the name and move the node as necessary - String name = (String) editedProps.get(ContentModel.PROP_NAME); + // we deal with 'name' as a rename/move operation later + String name = (String)editedProps.get(ContentModel.PROP_NAME); if (name != null) { - fileFolderService.rename(nodeRef, name); + editedProps.remove(ContentModel.PROP_NAME); } - Map repoProps = this.nodeService.getProperties(nodeRef); // we need to put all the properties from the editable bag back into // the format expected by the repository + Map repoProps = this.nodeService.getProperties(nodeRef); + repoProps.remove(ContentModel.PROP_NAME); // but first extract and deal with the special mimetype property for ContentData String mimetype = (String)editedProps.get(TEMP_PROP_MIMETYPE); @@ -180,7 +181,14 @@ public class EditContentPropertiesDialog extends BaseDialogBean this.nodeService.removeChild(assoc.getParentRef(), assoc.getChildRef()); } } - + + // get the name and move the node as necessary + if (name != null) + { + this.fileFolderService.rename(nodeRef, name); + this.editableNode.getProperties().put(ContentModel.PROP_NAME.toString(), name); + } + return outcome; } diff --git a/source/java/org/alfresco/web/bean/spaces/EditSpaceDialog.java b/source/java/org/alfresco/web/bean/spaces/EditSpaceDialog.java index f33bc8c37e..e522a090e9 100644 --- a/source/java/org/alfresco/web/bean/spaces/EditSpaceDialog.java +++ b/source/java/org/alfresco/web/bean/spaces/EditSpaceDialog.java @@ -72,15 +72,16 @@ public class EditSpaceDialog extends CreateSpaceDialog NodeRef nodeRef = this.editableNode.getNodeRef(); Map editedProps = this.editableNode.getProperties(); - // handle the name property separately, perform a rename in case it changed + // we deal with 'name' as a rename/move operation later String name = (String)editedProps.get(ContentModel.PROP_NAME); if (name != null) { - this.fileFolderService.rename(nodeRef, name); + editedProps.remove(ContentModel.PROP_NAME); } // get the current set of properties from the repository Map repoProps = this.nodeService.getProperties(nodeRef); + repoProps.remove(ContentModel.PROP_NAME); // add the "uifacets" aspect if required, properties will get set below if (this.nodeService.hasAspect(nodeRef, ContentModel.ASPECT_UIFACETS) == false) @@ -162,6 +163,13 @@ public class EditSpaceDialog extends CreateSpaceDialog this.nodeService.removeChild(assoc.getParentRef(), assoc.getChildRef()); } } + + // get the name and move the node as necessary + if (name != null) + { + this.fileFolderService.rename(nodeRef, name); + this.editableNode.getProperties().put(ContentModel.PROP_NAME.toString(), name); + } return outcome; } diff --git a/source/java/org/alfresco/web/bean/wcm/DeleteFileBrowseDialog.java b/source/java/org/alfresco/web/bean/wcm/DeleteFileBrowseDialog.java new file mode 100644 index 0000000000..ae7a7815ec --- /dev/null +++ b/source/java/org/alfresco/web/bean/wcm/DeleteFileBrowseDialog.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2005 Alfresco, Inc. + * + * Licensed under the Mozilla Public License version 1.1 + * with a permitted attribution clause. You may obtain a + * copy of the License at + * + * http://www.alfresco.org/legal/license.txt + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the + * License. + */ +package org.alfresco.web.bean.wcm; + +import javax.faces.context.FacesContext; + +import org.alfresco.web.app.AlfrescoNavigationHandler; + +/** + * @author Kevin Roast + */ +public class DeleteFileBrowseDialog extends DeleteFileDialog +{ + @Override + protected String doPostCommitProcessing(FacesContext context, String outcome) + { + return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME + + AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "browseSandbox"; + } +} diff --git a/source/java/org/alfresco/web/bean/wcm/DeleteFileDialog.java b/source/java/org/alfresco/web/bean/wcm/DeleteFileDialog.java index 9ec5f486cc..4f415317b0 100644 --- a/source/java/org/alfresco/web/bean/wcm/DeleteFileDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/DeleteFileDialog.java @@ -8,7 +8,6 @@ import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.web.app.AlfrescoNavigationHandler; import org.alfresco.web.app.Application; import org.alfresco.web.bean.dialog.BaseDialogBean; -import org.alfresco.web.bean.repository.Node; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -72,9 +71,6 @@ public class DeleteFileDialog extends BaseDialogBean @Override protected String doPostCommitProcessing(FacesContext context, String outcome) { - // clear action context - this.avmBrowseBean.setAvmNode(null); - return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME; } diff --git a/source/java/org/alfresco/web/bean/wcm/DeleteFolderBrowseDialog.java b/source/java/org/alfresco/web/bean/wcm/DeleteFolderBrowseDialog.java new file mode 100644 index 0000000000..e9cc72ed4a --- /dev/null +++ b/source/java/org/alfresco/web/bean/wcm/DeleteFolderBrowseDialog.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2005 Alfresco, Inc. + * + * Licensed under the Mozilla Public License version 1.1 + * with a permitted attribution clause. You may obtain a + * copy of the License at + * + * http://www.alfresco.org/legal/license.txt + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the + * License. + */ +package org.alfresco.web.bean.wcm; + +import javax.faces.context.FacesContext; + +import org.alfresco.web.app.AlfrescoNavigationHandler; + +/** + * @author Kevin Roast + */ +public class DeleteFolderBrowseDialog extends DeleteFolderDialog +{ + @Override + protected String doPostCommitProcessing(FacesContext context, String outcome) + { + return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME + + AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "browseSandbox"; + } +} diff --git a/source/java/org/alfresco/web/bean/wcm/DeleteFolderDialog.java b/source/java/org/alfresco/web/bean/wcm/DeleteFolderDialog.java index b9aa6f2339..cfb86d0b18 100644 --- a/source/java/org/alfresco/web/bean/wcm/DeleteFolderDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/DeleteFolderDialog.java @@ -8,7 +8,6 @@ import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.web.app.AlfrescoNavigationHandler; import org.alfresco.web.app.Application; import org.alfresco.web.bean.dialog.BaseDialogBean; -import org.alfresco.web.bean.repository.Node; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -72,9 +71,6 @@ public class DeleteFolderDialog extends BaseDialogBean @Override protected String doPostCommitProcessing(FacesContext context, String outcome) { - // clear action context - this.avmBrowseBean.setAvmNode(null); - return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME; } diff --git a/source/java/org/alfresco/web/bean/wcm/EditFilePropertiesDialog.java b/source/java/org/alfresco/web/bean/wcm/EditFilePropertiesDialog.java index 206296ddcc..a049d8c2cf 100644 --- a/source/java/org/alfresco/web/bean/wcm/EditFilePropertiesDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/EditFilePropertiesDialog.java @@ -20,6 +20,8 @@ import java.text.MessageFormat; import javax.faces.context.FacesContext; +import org.alfresco.repo.avm.AVMNodeConverter; +import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.model.FileExistsException; import org.alfresco.service.cmr.repository.InvalidNodeRefException; import org.alfresco.web.app.Application; @@ -35,6 +37,7 @@ import org.alfresco.web.bean.repository.Repository; public class EditFilePropertiesDialog extends EditContentPropertiesDialog { protected AVMBrowseBean avmBrowseBean; + protected AVMService avmService; // ------------------------------------------------------------------------------ @@ -48,6 +51,14 @@ public class EditFilePropertiesDialog extends EditContentPropertiesDialog this.avmBrowseBean = avmBrowseBean; } + /** + * @param avmService The AVMService to set. + */ + public void setAvmService(AVMService avmService) + { + this.avmService = avmService; + } + // ------------------------------------------------------------------------------ // Dialog implementation @@ -64,6 +75,13 @@ public class EditFilePropertiesDialog extends EditContentPropertiesDialog @Override protected String doPostCommitProcessing(FacesContext context, String outcome) { + // a rename may have occured - we need to reset the NodeRef of the modified AVM Node + // as an AVM NodeRef contains the name as part of ref - which can therefore change! + String name = this.editableNode.getName(); + String oldPath = AVMNodeConverter.ToAVMVersionPath(this.editableNode.getNodeRef()).getSecond(); + String newPath = oldPath.substring(0, oldPath.lastIndexOf('/') + 1) + name; + this.avmBrowseBean.setAvmNode(new AVMNode(this.avmService.lookup(-1, newPath))); + return outcome; } diff --git a/source/java/org/alfresco/web/bean/wcm/EditFolderPropertiesDialog.java b/source/java/org/alfresco/web/bean/wcm/EditFolderPropertiesDialog.java index 6c8fff270e..c57abfa674 100644 --- a/source/java/org/alfresco/web/bean/wcm/EditFolderPropertiesDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/EditFolderPropertiesDialog.java @@ -23,6 +23,8 @@ import java.util.List; import javax.faces.context.FacesContext; +import org.alfresco.repo.avm.AVMNodeConverter; +import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.spaces.EditSpaceDialog; import org.alfresco.web.ui.common.component.UIListItem; @@ -35,6 +37,7 @@ import org.alfresco.web.ui.common.component.UIListItem; public class EditFolderPropertiesDialog extends EditSpaceDialog { protected AVMBrowseBean avmBrowseBean; + protected AVMService avmService; // ------------------------------------------------------------------------------ @@ -48,6 +51,14 @@ public class EditFolderPropertiesDialog extends EditSpaceDialog this.avmBrowseBean = avmBrowseBean; } + /** + * @param avmService The AVMService to set. + */ + public void setAvmService(AVMService avmService) + { + this.avmService = avmService; + } + // ------------------------------------------------------------------------------ // Dialog implementation @@ -64,6 +75,13 @@ public class EditFolderPropertiesDialog extends EditSpaceDialog @Override protected String doPostCommitProcessing(FacesContext context, String outcome) { + // a rename may have occured - we need to reset the NodeRef of the modified AVM Node + // as an AVM NodeRef contains the name as part of ref - which can therefore change! + String name = this.editableNode.getName(); + String oldPath = AVMNodeConverter.ToAVMVersionPath(this.editableNode.getNodeRef()).getSecond(); + String newPath = oldPath.substring(0, oldPath.lastIndexOf('/') + 1) + name; + this.avmBrowseBean.setAvmNode(new AVMNode(this.avmService.lookup(-1, newPath))); + return outcome; } diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml index b244189dc0..4ea6598b8b 100644 --- a/source/web/WEB-INF/faces-config-beans.xml +++ b/source/web/WEB-INF/faces-config-beans.xml @@ -505,409 +505,6 @@ - - - The bean that backs up the Create XML Content Type Wizard - - CreateXmlContentTypeWizard - org.alfresco.web.bean.content.CreateXmlContentTypeWizard - session - - nodeService - #{NodeService} - - - fileFolderService - #{FileFolderService} - - - navigator - #{NavigationBean} - - - browseBean - #{BrowseBean} - - - contentService - #{ContentService} - - - - - - The bean that backs up the Create Web Content Wizard - - CreateWebContentWizard - org.alfresco.web.bean.wcm.CreateWebContentWizard - session - - nodeService - #{NodeService} - - - fileFolderService - #{FileFolderService} - - - searchService - #{SearchService} - - - navigator - #{NavigationBean} - - - browseBean - #{BrowseBean} - - - contentService - #{ContentService} - - - dictionaryService - #{DictionaryService} - - - avmService - #{AVMService} - - - avmBrowseBean - #{AVMBrowseBean} - - - - - - The bean that backs up the Create Website Wizard - - CreateWebsiteWizard - org.alfresco.web.bean.wcm.CreateWebsiteWizard - session - - nodeService - #{NodeService} - - - fileFolderService - #{FileFolderService} - - - navigator - #{NavigationBean} - - - searchService - #{SearchService} - - - avmService - #{AVMService} - - - - - - The bean that backs up the Import Website Dialog - - ImportWebsiteDialog - org.alfresco.web.bean.wcm.ImportWebsiteDialog - session - - nodeService - #{nodeService} - - - fileFolderService - #{FileFolderService} - - - contentService - #{ContentService} - - - navigationBean - #{NavigationBean} - - - avmService - #{AVMService} - - - - - - The bean that backs up the Invite Users Wizard a website - - InviteWebsiteUsersWizard - org.alfresco.web.bean.wcm.InviteWebsiteUsersWizard - 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 website file/folder browsing screens - - AVMBrowseBean - org.alfresco.web.bean.wcm.AVMBrowseBean - session - - avmService - #{AVMService} - - - navigationBean - #{NavigationBean} - - - nodeService - #{NodeService} - - - actionService - #{ActionService} - - - - - - The bean that backs up the AVM file editing screens - - AVMEditBean - org.alfresco.web.bean.wcm.AVMEditBean - session - - avmService - #{AVMService} - - - contentService - #{ContentService} - - - avmBrowseBean - #{AVMBrowseBean} - - - nodeService - #{NodeService} - - - - - - The bean that backs up the Delete AVM File Dialog - - DeleteFileDialog - org.alfresco.web.bean.wcm.DeleteFileDialog - session - - avmService - #{AVMService} - - - avmBrowseBean - #{AVMBrowseBean} - - - - - - The bean that backs up the Delete AVM Folder Dialog - - DeleteFolderDialog - org.alfresco.web.bean.wcm.DeleteFolderDialog - session - - avmService - #{AVMService} - - - avmBrowseBean - #{AVMBrowseBean} - - - - - - The bean that backs up the Create AVM Folder Dialog - - CreateFolderDialog - org.alfresco.web.bean.wcm.CreateFolderDialog - session - - avmService - #{AVMService} - - - avmBrowseBean - #{AVMBrowseBean} - - - nodeService - #{NodeService} - - - - - - The bean that backs up the AVM Add Content Dialog - - AddAvmContentDialog - org.alfresco.web.bean.wcm.AddAvmContentDialog - session - - nodeService - #{NodeService} - - - contentService - #{ContentService} - - - dictionaryService - #{DictionaryService} - - - avmService - #{AVMService} - - - avmBrowseBean - #{AVMBrowseBean} - - - - - - Backing bean used by the AVM File details dialog - - FileDetailsBean - org.alfresco.web.bean.wcm.FileDetailsBean - session - - nodeService - #{NodeService} - - - avmService - #{AVMService} - - - avmBrowseBean - #{AVMBrowseBean} - - - - - - Backing bean used by the AVM Folder details dialog - - FolderDetailsBean - org.alfresco.web.bean.wcm.FolderDetailsBean - session - - nodeService - #{NodeService} - - - avmService - #{AVMService} - - - avmBrowseBean - #{AVMBrowseBean} - - - - - - The bean that backs up the Edit AVM File Properties Dialog - - EditFilePropertiesDialog - org.alfresco.web.bean.wcm.EditFilePropertiesDialog - session - - nodeService - #{NodeService} - - - fileFolderService - #{FileFolderService} - - - dictionaryService - #{DictionaryService} - - - avmBrowseBean - #{AVMBrowseBean} - - - - - - The bean that backs up the Edit AVM Folder Properties Dialog - - EditFolderPropertiesDialog - org.alfresco.web.bean.wcm.EditFolderPropertiesDialog - session - - nodeService - #{NodeService} - - - fileFolderService - #{FileFolderService} - - - dictionaryService - #{DictionaryService} - - - avmBrowseBean - #{AVMBrowseBean} - - - The bean that backs up the Set Content Properties Dialog @@ -2463,6 +2060,451 @@ session + + + + The bean that backs up the Create XML Content Type Wizard + + CreateXmlContentTypeWizard + org.alfresco.web.bean.content.CreateXmlContentTypeWizard + session + + nodeService + #{NodeService} + + + fileFolderService + #{FileFolderService} + + + navigator + #{NavigationBean} + + + browseBean + #{BrowseBean} + + + contentService + #{ContentService} + + + + + + The bean that backs up the Create Web Content Wizard + + CreateWebContentWizard + org.alfresco.web.bean.wcm.CreateWebContentWizard + session + + nodeService + #{NodeService} + + + fileFolderService + #{FileFolderService} + + + searchService + #{SearchService} + + + navigator + #{NavigationBean} + + + browseBean + #{BrowseBean} + + + contentService + #{ContentService} + + + dictionaryService + #{DictionaryService} + + + avmService + #{AVMService} + + + avmBrowseBean + #{AVMBrowseBean} + + + + + + The bean that backs up the Create Website Wizard + + CreateWebsiteWizard + org.alfresco.web.bean.wcm.CreateWebsiteWizard + session + + nodeService + #{NodeService} + + + fileFolderService + #{FileFolderService} + + + navigator + #{NavigationBean} + + + searchService + #{SearchService} + + + avmService + #{AVMService} + + + + + + The bean that backs up the Import Website Dialog + + ImportWebsiteDialog + org.alfresco.web.bean.wcm.ImportWebsiteDialog + session + + nodeService + #{nodeService} + + + fileFolderService + #{FileFolderService} + + + contentService + #{ContentService} + + + navigationBean + #{NavigationBean} + + + avmService + #{AVMService} + + + + + + The bean that backs up the Invite Users Wizard a website + + InviteWebsiteUsersWizard + org.alfresco.web.bean.wcm.InviteWebsiteUsersWizard + 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 website file/folder browsing screens + + AVMBrowseBean + org.alfresco.web.bean.wcm.AVMBrowseBean + session + + avmService + #{AVMService} + + + navigationBean + #{NavigationBean} + + + nodeService + #{NodeService} + + + actionService + #{ActionService} + + + + + + The bean that backs up the AVM file editing screens + + AVMEditBean + org.alfresco.web.bean.wcm.AVMEditBean + session + + avmService + #{AVMService} + + + contentService + #{ContentService} + + + avmBrowseBean + #{AVMBrowseBean} + + + nodeService + #{NodeService} + + + + + + The bean that backs up the Delete AVM File Dialog + + DeleteFileDialog + org.alfresco.web.bean.wcm.DeleteFileDialog + session + + avmService + #{AVMService} + + + avmBrowseBean + #{AVMBrowseBean} + + + + + + The bean that backs up the Delete AVM Folder Dialog + + DeleteFolderDialog + org.alfresco.web.bean.wcm.DeleteFolderDialog + session + + avmService + #{AVMService} + + + avmBrowseBean + #{AVMBrowseBean} + + + + + + The bean that backs up the Delete then browse AVM File Dialog + + DeleteFileBrowseDialog + org.alfresco.web.bean.wcm.DeleteFileBrowseDialog + session + + avmService + #{AVMService} + + + avmBrowseBean + #{AVMBrowseBean} + + + + + + The bean that backs up the Delete then browse AVM Folder Dialog + + DeleteFolderBrowseDialog + org.alfresco.web.bean.wcm.DeleteFolderBrowseDialog + session + + avmService + #{AVMService} + + + avmBrowseBean + #{AVMBrowseBean} + + + + + + The bean that backs up the Create AVM Folder Dialog + + CreateFolderDialog + org.alfresco.web.bean.wcm.CreateFolderDialog + session + + avmService + #{AVMService} + + + avmBrowseBean + #{AVMBrowseBean} + + + nodeService + #{NodeService} + + + + + + The bean that backs up the AVM Add Content Dialog + + AddAvmContentDialog + org.alfresco.web.bean.wcm.AddAvmContentDialog + session + + nodeService + #{NodeService} + + + contentService + #{ContentService} + + + dictionaryService + #{DictionaryService} + + + avmService + #{AVMService} + + + avmBrowseBean + #{AVMBrowseBean} + + + + + + Backing bean used by the AVM File details dialog + + FileDetailsBean + org.alfresco.web.bean.wcm.FileDetailsBean + session + + nodeService + #{NodeService} + + + avmService + #{AVMService} + + + avmBrowseBean + #{AVMBrowseBean} + + + + + + Backing bean used by the AVM Folder details dialog + + FolderDetailsBean + org.alfresco.web.bean.wcm.FolderDetailsBean + session + + nodeService + #{NodeService} + + + avmService + #{AVMService} + + + avmBrowseBean + #{AVMBrowseBean} + + + + + + The bean that backs up the Edit AVM File Properties Dialog + + EditFilePropertiesDialog + org.alfresco.web.bean.wcm.EditFilePropertiesDialog + session + + nodeService + #{NodeService} + + + avmService + #{AVMService} + + + fileFolderService + #{FileFolderService} + + + dictionaryService + #{DictionaryService} + + + avmBrowseBean + #{AVMBrowseBean} + + + + + + The bean that backs up the Edit AVM Folder Properties Dialog + + EditFolderPropertiesDialog + org.alfresco.web.bean.wcm.EditFolderPropertiesDialog + session + + nodeService + #{NodeService} + + + avmService + #{AVMService} + + + fileFolderService + #{FileFolderService} + + + dictionaryService + #{DictionaryService} + + + avmBrowseBean + #{AVMBrowseBean} + + diff --git a/source/web/WEB-INF/faces-config-navigation.xml b/source/web/WEB-INF/faces-config-navigation.xml index a05d2c8448..6cdf52f958 100644 --- a/source/web/WEB-INF/faces-config-navigation.xml +++ b/source/web/WEB-INF/faces-config-navigation.xml @@ -870,6 +870,14 @@ + + /jsp/* + + browseSandbox + /jsp/wcm/browse-sandbox.jsp + + + /jsp/wcm/* @@ -880,10 +888,6 @@ addAvmContent /jsp/wcm/add-content-dialog.jsp - - browseSandbox - /jsp/wcm/browse-sandbox.jsp - editAvmFile /jsp/wcm/edit-file.jsp