notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests 1 Projects 2 Releases 9 Packages Wiki Activity Actions

Bug fixes

Browse source 
* Index.aspx: Gives this page a title

* AdminController.cs: Trying to fix this Index : /Admin ... a 404

* YavscModel.csproj:
* Commande.cs:
* FileSystemController.cs:
* WebFileSystemManager.cs: Refactoring the name of the files manager
  class

* Index.aspx: Fixes the file system access

* RemoveRole.aspx: Role removal form, had not a canonical name!

* Web.csproj: a page was renamed
This commit is contained in:
Paul Schneider 2015-10-29 12:07:07 +01:00
commit 2a30ae85a9
11 changed files with 50 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
yavscModel/ChangeLog
View file

@ -1,3 +1,10 @@
2015-10-29 Paul Schneider <paul@pschneider.fr>
* YavscModel.csproj:
* Commande.cs:
* WebFileSystemManager.cs: Refactoring the name of the files
manager class
2015-10-28 Paul Schneider <paul@pschneider.fr>
* ICalendarManager.cs: WIP booking TODO a calendar provider

27
yavscModel/FileSystem/FileSystemManager.cs → yavscModel/FileSystem/WebFileSystemManager.cs
View file

@ -38,7 +38,7 @@ namespace Yavsc.Model.FileSystem
/// It just provides simple method for a small set of
/// files, in a small tree of sub-folders .
/// </summary>
public class FileSystemManager
public class WebFileSystemManager
{
/// <summary>
/// Gets or sets the size of the max file.
@ -56,23 +56,18 @@ namespace Yavsc.Model.FileSystem
/// <summary>
/// Initializes a new instance of the <see cref="Yavsc.Model.FileSystem.FileSystemManager"/> class.
/// </summary>
public FileSystemManager (string rootDirectory="~/users/{0}")
public WebFileSystemManager (string rootDirectory="~/users")
{
string rootpath = HttpContext.Current.Server.MapPath (rootDirectory);
var rdi = new DirectoryInfo (rootpath);
if (!rdi.Exists)
rdi.Create ();
MembershipUser user = Membership.GetUser ();
if (user == null)
throw new Exception ("Not membership available");
Prefix = HttpContext.Current.Server.MapPath (
string.Format (rootDirectory, user.UserName));
Prefix = Path.Combine(rootpath, user.ProviderUserKey.ToString());
}
/// <summary>
/// Initializes a new instance of the <see cref="Yavsc.Model.FileSystem.FileSystemManager"/> class.
/// </summary>
public FileSystemManager (string username, string rootDirectory="~/users/{0}")
{
Prefix = HttpContext.Current.Server.MapPath (
string.Format (rootDirectory, username));
}
string regexFileName = "^[A-Za-z0-9#^!+ _~\\-.]+$";
/// <summary>
/// Determines if the specified name is OK.
@ -166,7 +161,7 @@ namespace Yavsc.Model.FileSystem
return (di.GetFiles ());
}
public IEnumerable<FileInfo> GetFiles (string username, string subdir, bool createNonExistent = false)
public FileInfo[] GetFiles (string username, string subdir)
{
string path = Prefix;
if (subdir != null) {
@ -174,9 +169,9 @@ namespace Yavsc.Model.FileSystem
path = Path.Combine (Prefix, subdir);
}
DirectoryInfo di = new DirectoryInfo (path);
if (createNonExistent)
if (!di.Exists)
di.Create ();
if (!di.Exists)
return new FileInfo[0];
return (di.GetFiles ());
}

4
yavscModel/FrontOffice/Commande.cs
View file

@ -89,8 +89,8 @@ namespace Yavsc.Model.FrontOffice
FromPost (collection, files);
}
private FileSystemManager GetFSM() {
return new FileSystemManager ("~/commands/{0}");
private WebFileSystemManager GetFSM() {
return new WebFileSystemManager ("~/commands/{0}");
}
}
}

2
yavscModel/YavscModel.csproj
View file

@ -114,7 +114,6 @@
<Compile Include="FrontOffice\Catalog\CatalogHelper.cs" />
<Compile Include="FrontOffice\Catalog\CatalogManager.cs" />
<Compile Include="FrontOffice\Catalog\CatalogProvider.cs" />
<Compile Include="FileSystem\FileSystemManager.cs" />
<Compile Include="FileSystem\InvalidDirNameException.cs" />
<Compile Include="FileSystem\WebFileInfo.cs" />
<Compile Include="FrontOffice\CommandStatus.cs" />
@ -179,6 +178,7 @@
<Compile Include="Calendar\IFreeDateSet.cs" />
<Compile Include="Calendar\ICalendarManager.cs" />
<Compile Include="Messaging\Notification.cs" />
<Compile Include="FileSystem\WebFileSystemManager.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>