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

webdav portal bugs fix

Browse source
This commit is contained in:
vfedosevich 2015-01-12 01:28:59 -08:00
parent 5d37adf09b
commit 05d9fddb5d
6 changed files with 62 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.hgignore
View file

@ -30,3 +30,4 @@ WebsitePanel/Sources/UpgradeLog.XML
WebsitePanel/Sources/UpgradeLog.htm WebsitePanel/Sources/UpgradeLog.htm
WebsitePanel/Sources/_UpgradeReport_Files/UpgradeReport_Information.png WebsitePanel/Sources/_UpgradeReport_Files/UpgradeReport_Information.png
WebsitePanel/Sources/_UpgradeReport_Files/UpgradeReport_Success.png WebsitePanel/Sources/_UpgradeReport_Files/UpgradeReport_Success.png
WebsitePanel/Sources/packages

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

@ -19,6 +19,7 @@ using System.Net;
namespace WebsitePanel.WebDavPortal.Controllers namespace WebsitePanel.WebDavPortal.Controllers
{ {
[ValidateInput(false)]
[LdapAuthorization] [LdapAuthorization]
public class FileSystemController : Controller public class FileSystemController : Controller
{ {

14
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/Login.cshtml
View file

@ -16,9 +16,9 @@
</div> </div>
} }
<div class="form-group"> <div class="form-group">
<label for="inputEmail" class="col-sm-2 control-label">Login</label> <label for="inputLogin" class="col-sm-2 control-label">Login</label>
<div class="col-sm-10"> <div class="col-sm-10">
@Html.TextBoxFor(x => x.Login, new { @class = "form-control", id = "inputPassword", placeholder = "Login" }) @Html.TextBoxFor(x => x.Login, new { @class = "form-control", id = "inputLogin", placeholder = "Login", autofocus = "autofocus" })
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -34,3 +34,13 @@
</div> </div>
</form> </form>
</div> </div>
@section scripts
{
<script>
$(document).ready(function () {
$('[autofocus]').focus();
});
</script>
}

4
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
View file

@ -1,9 +1,11 @@
@using WebsitePanel.WebDav.Core.Client @using WebsitePanel.WebDav.Core.Client
@using Ninject @using Ninject
@using WebsitePanel.WebDavPortal.Config
@model WebsitePanel.WebDavPortal.Models.ModelForWebDav @model WebsitePanel.WebDavPortal.Models.ModelForWebDav
@{ @{
var webDavManager = DependencyResolver.Current.GetService<WebsitePanel.WebDavPortal.Models.IWebDavManager>(); var webDavManager = DependencyResolver.Current.GetService<WebsitePanel.WebDavPortal.Models.IWebDavManager>();
ViewBag.Title = (string.IsNullOrEmpty(Model.UrlSuffix) ? webDavManager.OrganizationName : Model.UrlSuffix); ViewBag.Title = WebDavAppConfigManager.Instance.ApplicationName;
} }
@Scripts.Render("~/bundles/jquery") @Scripts.Render("~/bundles/jquery")
@Scripts.Render("~/bundles/appScripts") @Scripts.Render("~/bundles/appScripts")

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

@ -6,7 +6,7 @@
@{ @{
string actualPath = Model.ItemType == ItemType.Folder ? "~/Content/Images/folder_100x100.png" : WebDavAppConfigManager.Instance.FileIcons[Path.GetExtension(Model.DisplayName.Trim('/'))]; string actualPath = Model.ItemType == ItemType.Folder ? "~/Content/Images/folder_100x100.png" : WebDavAppConfigManager.Instance.FileIcons[Path.GetExtension(Model.DisplayName.Trim('/'))];
string name = Model.ItemType == ItemType.Folder ? Model.DisplayName.Trim('/') : Path.GetFileNameWithoutExtension(Model.DisplayName); string name = Model.ItemType == ItemType.Folder ? Model.DisplayName.Trim('/') : Model.DisplayName;
var opener = new FileOpenerManager()[Path.GetExtension(Model.DisplayName)]; var opener = new FileOpenerManager()[Path.GetExtension(Model.DisplayName)];
bool isTargetBlank; bool isTargetBlank;
string href = "/"; string href = "/";
@ -18,7 +18,6 @@
break; break;
default: default:
isTargetBlank = false; isTargetBlank = false;
var webDavManager = DependencyResolver.Current.GetService<WebsitePanel.WebDavPortal.Models.IWebDavManager>();
href = Model.Href.AbsolutePath; href = Model.Href.AbsolutePath;
break; break;
} }

14
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
View file

@ -76,19 +76,9 @@
--> -->
<system.web> <system.web>
<compilation debug="true" targetFramework="4.5" /> <compilation debug="true" targetFramework="4.5" />
<siteMap defaultProvider="WebsitePanelSiteMapProvider" enabled="true">
<providers>
<add name="WebsitePanelSiteMapProvider" type="WebsitePanel.WebPortal.WebsitePanelSiteMapProvider, WebsitePanel.WebPortal" securityTrimmingEnabled="true" />
</providers>
</siteMap>
<!-- Set default scheme -->
<pages theme="Default" validateRequest="false" controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
<controls>
<add tagPrefix="ajaxToolkit" namespace="AjaxControlToolkit" assembly="AjaxControlToolkit" />
</controls>
</pages>
<!-- Maximum size of uploaded file, in MB --> <!-- Maximum size of uploaded file, in MB -->
<httpRuntime executionTimeout="1800" requestValidationMode="2.0" maxRequestLength="16384" enableVersionHeader="false" /> <httpRuntime executionTimeout="1800" requestValidationMode="2.0" requestPathInvalidCharacters="" maxRequestLength="16384" enableVersionHeader="false" />
<pages validateRequest="false" />
<!-- <!--
ASMX is mapped to a new handler so that proxy javascripts can also be served. ASMX is mapped to a new handler so that proxy javascripts can also be served.
--> -->