zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webdav portal routes fix

Browse source
This commit is contained in:
vfedosevich 2015-01-19 01:04:13 -08:00
parent 67aab39780
commit 1da7c6c3b3
6 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
View file

@ -51,7 +51,7 @@ namespace WebsitePanel.WebDav.Core.Managers
_currentFolder = _webDavSession.OpenFolder(string.Format("{0}{1}/{2}", WebDavAppConfigManager.Instance.WebdavRoot, WspContext.User.OrganizationId, pathPart)); _currentFolder = _webDavSession.OpenFolder(string.Format("{0}{1}/{2}", WebDavAppConfigManager.Instance.WebdavRoot, WspContext.User.OrganizationId, pathPart));
} }
children = _currentFolder.GetChildren(); children = _currentFolder.GetChildren().Where(x => !WebDavAppConfigManager.Instance.ElementsRendering.ElementsToIgnore.Contains(x.DisplayName.Trim('/'))).ToArray();
} }
List<IHierarchyItem> sortedChildren = children.Where(x => x.ItemType == ItemType.Folder).OrderBy(x => x.DisplayName).ToList(); List<IHierarchyItem> sortedChildren = children.Where(x => x.ItemType == ItemType.Folder).OrderBy(x => x.DisplayName).ToList();

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs
View file

@ -43,7 +43,7 @@ namespace WebsitePanel.WebDavPortal
#endregion #endregion
routes.MapRoute( routes.MapRoute(
name: "Office365DocumentRoute", name: FileSystemRouteNames.OfficeOnlinePath,
url: "office365/{org}/{*pathPart}", url: "office365/{org}/{*pathPart}",
defaults: new { controller = "FileSystem", action = "ShowOfficeDocument", pathPart = UrlParameter.Optional } defaults: new { controller = "FileSystem", action = "ShowOfficeDocument", pathPart = UrlParameter.Optional }
); );

4
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs
View file

@ -46,8 +46,6 @@ namespace WebsitePanel.WebDavPortal.Controllers
{ {
_authenticationService.CreateAuthenticationTicket(user); _authenticationService.CreateAuthenticationTicket(user);
Session[WebDavAppConfigManager.Instance.SessionKeys.WebDavManager] = null;
return RedirectToRoute(FileSystemRouteNames.FilePath, new { org = WspContext.User.OrganizationId }); return RedirectToRoute(FileSystemRouteNames.FilePath, new { org = WspContext.User.OrganizationId });
} }
@ -59,8 +57,6 @@ namespace WebsitePanel.WebDavPortal.Controllers
{ {
_authenticationService.LogOut(); _authenticationService.LogOut();
Session[WebDavAppConfigManager.Instance.SessionKeys.WebDavManager] = null;
return RedirectToRoute(AccountRouteNames.Login); return RedirectToRoute(AccountRouteNames.Login);
} }
} }

3
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
View file

@ -57,10 +57,9 @@ namespace WebsitePanel.WebDavPortal.Controllers
try try
{ {
IEnumerable<IHierarchyItem> children = _webdavManager.OpenFolder(pathPart).Where(x => !WebDavAppConfigManager.Instance.ElementsRendering.ElementsToIgnore.Contains(x.DisplayName.Trim('/'))); IEnumerable<IHierarchyItem> children = _webdavManager.OpenFolder(pathPart);
var model = new ModelForWebDav { Items = children.Take(WebDavAppConfigManager.Instance.ElementsRendering.DefaultCount), UrlSuffix = pathPart }; var model = new ModelForWebDav { Items = children.Take(WebDavAppConfigManager.Instance.ElementsRendering.DefaultCount), UrlSuffix = pathPart };
Session[WebDavAppConfigManager.Instance.SessionKeys.ResourseRenderCount] = WebDavAppConfigManager.Instance.ElementsRendering.DefaultCount;
return View(model); return View(model);
} }

1
WebsitePanel/Sources/WebsitePanel.WebDavPortal/UI/Routes/FileSystemRouteNames.cs
View file

@ -8,6 +8,7 @@ namespace WebsitePanel.WebDavPortal.UI.Routes
public class FileSystemRouteNames public class FileSystemRouteNames
{ {
public const string FilePath = "FilePathRoute"; public const string FilePath = "FilePathRoute";
public const string OfficeOnlinePath = "OfficeOnline";
public const string ShowAdditionalContent = "ShowAdditionalContentRoute"; public const string ShowAdditionalContent = "ShowAdditionalContentRoute";
} }
} }

7
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
View file

@ -1,7 +1,9 @@
@using WebsitePanel.WebDav.Core.Client @using WebsitePanel.WebDav.Core
@using WebsitePanel.WebDav.Core.Client
@using WebsitePanel.WebDav.Core.Config @using WebsitePanel.WebDav.Core.Config
@using WebsitePanel.WebDavPortal.FileOperations @using WebsitePanel.WebDavPortal.FileOperations
@using Ninject; @using Ninject;
@using WebsitePanel.WebDavPortal.UI.Routes
@model IHierarchyItem @model IHierarchyItem
@{ @{
@ -14,7 +16,8 @@
{ {
case FileOpenerType.OfficeOnline: case FileOpenerType.OfficeOnline:
isTargetBlank = true; isTargetBlank = true;
href = string.Concat(Url.Action("ShowOfficeDocument", "FileSystem"), Model.DisplayName); var pathPart = Model.Href.AbsolutePath.Replace("/" + WspContext.User.OrganizationId, "");
href = string.Concat(Url.RouteUrl(FileSystemRouteNames.OfficeOnlinePath, new { org = WspContext.User.OrganizationId, pathPart = "" }), pathPart);
break; break;
default: default:
isTargetBlank = false; isTargetBlank = false;