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

WCM Services - "sandbox service" - cleanup (for consistency)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12174 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-11-28 12:32:27 +00:00
parent c355112433
commit 58e6787a16
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ public class RevertAllDialog extends BaseDialogBean
String webApp = this.avmBrowseBean.getWebapp(); String webApp = this.avmBrowseBean.getWebapp();
String userSandboxId = this.avmBrowseBean.getSandbox(); String userSandboxId = this.avmBrowseBean.getSandbox();
getSandboxService().revertAllWebApp(userSandboxId, webApp); getSandboxService().revertWebApp(userSandboxId, webApp);
String msg = MessageFormat.format(Application.getMessage( String msg = MessageFormat.format(Application.getMessage(
context, MSG_REVERTALL_SUCCESS), this.avmBrowseBean.getUsername()); context, MSG_REVERTALL_SUCCESS), this.avmBrowseBean.getUsername());

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

@@ -79,7 +79,7 @@ public class RevertSelectedDialog extends BaseDialogBean
String webApp = this.avmBrowseBean.getWebapp(); String webApp = this.avmBrowseBean.getWebapp();
String userSandboxId = this.avmBrowseBean.getSandbox(); String userSandboxId = this.avmBrowseBean.getSandbox();
getSandboxService().revertAllWebApp(userSandboxId, webApp); getSandboxService().revertWebApp(userSandboxId, webApp);
String msg = MessageFormat.format(Application.getMessage( String msg = MessageFormat.format(Application.getMessage(
context, MSG_REVERTSELECTED_SUCCESS), this.avmBrowseBean.getUsername()); context, MSG_REVERTSELECTED_SUCCESS), this.avmBrowseBean.getUsername());

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

@@ -456,7 +456,7 @@ public class UIUserSandboxes extends SelfRenderingComponent implements Serializa
out.write("</nobr></td><td><nobr>"); out.write("</nobr></td><td><nobr>");
// Preview Website // Preview Website
String websiteUrl = AVMUtil.getPreviewURI(mainStore, '/' + JNDIConstants.DIR_DEFAULT_WWW + '/' + JNDIConstants.DIR_DEFAULT_APPBASE + '/' + getWebapp()); String websiteUrl = AVMUtil.getPreviewURI(mainStore, JNDIConstants.DIR_DEFAULT_WWW_APPBASE + '/' + getWebapp());
Map requestMap = context.getExternalContext().getRequestMap(); Map requestMap = context.getExternalContext().getRequestMap();
requestMap.put(REQUEST_PREVIEW_REF, websiteUrl); requestMap.put(REQUEST_PREVIEW_REF, websiteUrl);
Utils.encodeRecursive(context, aquireAction( Utils.encodeRecursive(context, aquireAction(
@@ -720,7 +720,7 @@ public class UIUserSandboxes extends SelfRenderingComponent implements Serializa
// compare user sandbox to staging sandbox - filter by current webapp, include deleted items // compare user sandbox to staging sandbox - filter by current webapp, include deleted items
String userStore = AVMUtil.buildUserMainStoreName(storeRoot, username); String userStore = AVMUtil.buildUserMainStoreName(storeRoot, username);
List<AVMNodeDescriptor> nodes = sandboxService.listChangedItemsWebApp(userStore, getWebapp(), true); List<AVMNodeDescriptor> nodes = sandboxService.listChangedWebApp(userStore, getWebapp(), true);
if (nodes.size() != 0) if (nodes.size() != 0)
{ {
@@ -840,7 +840,7 @@ public class UIUserSandboxes extends SelfRenderingComponent implements Serializa
// build node context required for actions // build node context required for actions
AVMNode avmNode = new AVMNode(node); AVMNode avmNode = new AVMNode(node);
String assetPath = sourcePath.substring(rootPathIndex); String assetPath = sourcePath.substring(rootPathIndex);
String previewUrl = AVMUtil.getPreviewURI(userStore, '/' + JNDIConstants.DIR_DEFAULT_WWW + '/' + JNDIConstants.DIR_DEFAULT_APPBASE + assetPath); String previewUrl = AVMUtil.getPreviewURI(userStore, JNDIConstants.DIR_DEFAULT_WWW_APPBASE + assetPath);
avmNode.getProperties().put("previewUrl", previewUrl); avmNode.getProperties().put("previewUrl", previewUrl);
// size of files // size of files