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

refactoring

Browse source
This commit is contained in:
Paul Schneider 2014-10-06 04:58:47 +02:00
commit f3a2efa244
64 changed files with 121 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

2
web/Admin/DataManager.cs
View file

@ -1,7 +1,7 @@
using System;
using System.Diagnostics;
using System.IO;
using yavscModel.Admin;
using Yavsc.Model.Admin;
using Npgsql.Web.Blog;
namespace Yavsc.Admin

17
web/Basket/Basket.cs
View file

@ -1,17 +0,0 @@
using System;
using SalesCatalog.Model;
using System.Collections.Generic;
namespace Yavsc.Basket
{
public class Basket
{
public Basket ()
{
}
public void Add(Product p)
{
}
}
}

2
web/Controllers/AccountController.cs
View file

@ -10,7 +10,7 @@ using System.Web.Mvc.Ajax;
using System.Web.Profile;
using System.Web.Security;
using Yavsc;
using yavscModel.RolesAndMembers;
using Yavsc.Model.RolesAndMembers;
using Yavsc.Helpers;
namespace Yavsc.Controllers

4
web/Controllers/AdminController.cs
View file

@ -5,9 +5,9 @@ using System.Web;
using System.Web.Mvc;
using System.Web.Mvc.Ajax;
using System.Web.Security;
using yavscModel.RolesAndMembers;
using Yavsc.Model.RolesAndMembers;
namespace Yavsc.Controllers.Controllers
namespace Yavsc.Controllers
{
public class AdminController : Controller
{

4
web/Controllers/BackOfficeController.cs
View file

@ -4,7 +4,7 @@ using System.Linq;
using System.Web;
using System.Web.Mvc;
using Yavsc.Admin;
using yavscModel.Admin;
using Yavsc.Model.Admin;
namespace Yavsc.Controllers
@ -66,5 +66,7 @@ namespace Yavsc.Controllers
return View (datac);
}
/*[Authorize(Roles="Admin")]
public ActionResult Estimate*/
}
}

2
web/Controllers/BasketController.cs
View file

@ -4,7 +4,7 @@ using System.Linq;
using System.Web;
using System.Web.Security;
using System.Web.Http;
using yavscModel.WorkFlow;
using Yavsc.Model.WorkFlow;
namespace Yavsc.ApiControllers
{

22
web/Controllers/BasketImpact.cs
View file

@ -1,22 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Http;
using WorkFlowProvider;
using yavscModel.WorkFlow;
using System.Web.Http.Controllers;
using System.Web.Http.ModelBinding;
namespace Yavsc.ApiControllers
{
public class BasketImpact
{
public string ProductRef { get; set; }
public int Count { get; set; }
public string Message { get; set; }
}
}

19
web/Controllers/BlogsApiController.cs
View file

@ -2,20 +2,20 @@
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Mvc;
using System.Web.Mvc.Ajax;
using System.Web.Security;
using System.Web.Http;
using Npgsql.Web.Blog;
using yavscModel.Blogs;
using Yavsc.Model.Blogs;
namespace Yavsc.Controllers
namespace Yavsc.ApiControllers
{
public class BlogsApiController : Controller
public class BlogsApiController : ApiController
{
private const string adminRoleName = "Admin";
protected override void Initialize (System.Web.Routing.RequestContext requestContext)
protected override void Initialize (System.Web.Http.Controllers.HttpControllerContext controllerContext)
{
base.Initialize (requestContext);
base.Initialize (controllerContext);
if (!Roles.RoleExists (adminRoleName)) {
Roles.CreateRole (adminRoleName);
}
@ -35,7 +35,7 @@ namespace Yavsc.Controllers
return BlogManager.Tag (postid, tag);
}
public static HttpStatusCodeResult RemovePost(string user, string title) {
public static void RemovePost(string user, string title) {
if (!Roles.IsUserInRole ("Admin")) {
string rguser = Membership.GetUser ().UserName;
if (rguser != user) {
@ -47,12 +47,11 @@ namespace Yavsc.Controllers
}
BlogEntry e = BlogManager.GetPost (user, title);
if (e == null) {
return new HttpNotFoundResult (
throw new KeyNotFoundException (
string.Format("Aucun post portant le titre \"{0}\" pour l'utilisateur {1}",
title, user));
}
BlogManager.RemovePost (user, title);
return new HttpStatusCodeResult (200);
}
public void RemoveTag(long tagid) {

11
web/Controllers/BlogsController.cs
View file

@ -14,8 +14,9 @@ using System.Web.Security;
using CodeKicker.BBCode;
using Npgsql.Web.Blog;
using Yavsc;
using yavscModel;
using yavscModel.Blogs;
using Yavsc.Model;
using Yavsc.Model.Blogs;
using Yavsc.ApiControllers;
namespace Yavsc.Controllers
{
@ -250,8 +251,10 @@ namespace Yavsc.Controllers
ViewData["returnUrl"]=returnUrl;
if (!confirm)
return View ("RemovePost");
HttpStatusCodeResult res = BlogsApiController.RemovePost (user,title);
return (res.StatusCode==200? Return(returnUrl):res);
BlogsApiController.RemovePost (user,title);
if (returnUrl == null)
RedirectToAction ("Index",new { user = user });
return Redirect (returnUrl);
}
private ActionResult Return (string returnUrl)

21
web/Controllers/Commande.cs
View file

@ -1,21 +0,0 @@
using System;
using Yavsc;
using SalesCatalog;
using SalesCatalog.Model;
using System.Web.Mvc;
using System.Web;
using System.Text.RegularExpressions;
using System.IO;
using Yavsc.Controllers;
namespace Yavsc.Controllers
{
public class Commande
{
public Commande(FormCollection collection)
{
}
}
}

1
web/Controllers/FileSystemController.cs
View file

@ -5,7 +5,6 @@ using System.Web;
using System.Web.Mvc;
using System.IO;
using System.Web.Security;
using FileSystem;
using System.Text.RegularExpressions;
namespace Yavsc.Controllers

11
web/Controllers/FrontOfficeApiController.cs
View file

@ -13,7 +13,7 @@ using System.IO;
using System.Net;
using WorkFlowProvider;
using System.Web.Security;
using yavscModel.WorkFlow;
using Yavsc.Model.WorkFlow;
namespace Yavsc.ApiControllers
{
@ -33,12 +33,7 @@ namespace Yavsc.ApiControllers
return CatalogManager.GetCatalog ().GetBrand (brandName).GetProductCategory (prodCategorie)
;
}
[AcceptVerbs("GET","POST")]
public string Command()
{
throw new NotImplementedException();
}
/*
public HttpResponseMessage Post()
{
@ -66,7 +61,7 @@ namespace Yavsc.ApiControllers
return result;
}
*/
[Authorize]

2
web/Controllers/FrontOfficeController.cs
View file

@ -8,7 +8,7 @@ using System.Text.RegularExpressions;
using System.IO;
using Yavsc.Controllers;
using System.Collections.Generic;
using yavscModel.WorkFlow;
using Yavsc.Model.WorkFlow;
using WorkFlowProvider;
using System.Web.Security;

3
web/Controllers/WorkFlowController.cs
View file

@ -5,7 +5,7 @@ using System.Web;
using System.Web.Http;
using WorkFlowProvider;
using yavscModel.WorkFlow;
using Yavsc.Model.WorkFlow;
using System.Web.Http.Controllers;
using System.Web.Security;
@ -18,6 +18,7 @@ namespace Yavsc.ApiControllers
protected override void Initialize (HttpControllerContext controllerContext)
{
// TODO move it in a module initialization
base.Initialize (controllerContext);
if (!Roles.RoleExists (adminRoleName)) {
Roles.CreateRole (adminRoleName);

2
web/Views/RegisterPage.cs
View file

@ -1,6 +1,6 @@
using System;
using System.Web.UI.WebControls;
using yavscModel.RolesAndMembers;
using Yavsc.Model.RolesAndMembers;
namespace Yavsc

8
web/Views/Web.config
View file

@ -21,13 +21,13 @@
</controls>
<namespaces>
<add namespace="SalesCatalog.Model" />
<add namespace="yavscModel" />
<add namespace="Yavsc.Model" />
<add namespace="Yavsc.Helpers" />
<add namespace="Yavsc.Admin" />
<add namespace="Yavsc.CatExts" />
<add namespace="yavscModel.RolesAndMembers" />
<add namespace="yavscModel.Admin" />
<add namespace="yavscModel.Blogs" />
<add namespace="Yavsc.Model.RolesAndMembers" />
<add namespace="Yavsc.Model.Admin" />
<add namespace="Yavsc.Model.Blogs" />
</namespaces>
</pages>
</system.web>

11
web/Web.config
View file

@ -65,9 +65,10 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
<add assembly="System.Net.Http.WebRequest, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=c7439020c8fedf87" />
<add assembly="System.Configuration.Install, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add assembly="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add assembly="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add assembly="System.Web.Http.WebHost" />
<add assembly="System.Net.Http.Formatting" />
</assemblies>
</compilation>
<!-- samarcheupa
@ -86,7 +87,7 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
<add namespace="System.Web.Routing" />
<add namespace="System.Linq" />
<add namespace="System.Collections.Generic" />
<add namespace="Yavsc.Helpers" />
<add namespace="Yavsc.Helpers" />
</namespaces>
</pages>
<authorization>
@ -119,9 +120,9 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
</providers>
</roleManager>
<workflow defaultProvider="ITProvider">
<providers>
<clear/>
<add name="ITProvider" type="ITContentProvider.ITCPNpgsqlProvider, ITContentProvider" applicationName="/" connectionStringName="yavsc"/>
<providers>
<clear />
<add name="ITProvider" type="ITContentProvider.ITCPNpgsqlProvider, ITContentProvider" applicationName="/" connectionStringName="yavsc" />
</providers>
</workflow>
<profile defaultProvider="NpgsqlProfileProvider">

16
web/Web.csproj
View file

@ -62,9 +62,7 @@
<Reference Include="Npgsql" />
<Reference Include="System.Data" />
<Reference Include="System.Security" />
<Reference Include="nunit.framework, Version=2.6.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
<Package>nunit</Package>
</Reference>
<Reference Include="nunit.framework, Version=2.6.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
<Reference Include="CodeKicker.BBCode">
<HintPath>lib\CodeKicker.BBCode.dll</HintPath>
</Reference>
@ -109,7 +107,6 @@
<Folder Include="Views\FileSystem\" />
<Folder Include="CatExts\" />
<Folder Include="Views\WorkFlow\" />
<Folder Include="Basket\" />
</ItemGroup>
<ItemGroup>
<Compile Include="Controllers\HomeController.cs" />
@ -137,12 +134,9 @@
<Compile Include="CatExts\WebCatalogExtensions.cs" />
<Compile Include="Controllers\WorkFlowController.cs" />
<Compile Include="Controllers\FrontOfficeApiController.cs" />
<Compile Include="Controllers\Commande.cs" />
<Compile Include="Helpers\YavscHelpers.cs" />
<Compile Include="Controllers\BasketController.cs" />
<Compile Include="Basket\Basket.cs" />
<Compile Include="FileInfoCollection.cs" />
<Compile Include="Controllers\BasketImpact.cs" />
<Compile Include="MvcActionValueBinder.cs" />
<Compile Include="Controllers\BlogsApiController.cs" />
<Compile Include="Controllers\AdminController.cs" />
@ -254,10 +248,6 @@
<Project>{821FF72D-9F4B-4A2C-B95C-7B965291F119}</Project>
<Name>WorkFlowProvider</Name>
</ProjectReference>
<ProjectReference Include="..\yavscModel\yavscModel.csproj">
<Project>{68F5B80A-616E-4C3C-91A0-828AA40000BD}</Project>
<Name>yavscModel</Name>
</ProjectReference>
<ProjectReference Include="..\WebControls\WebControls.csproj">
<Project>{59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}</Project>
<Name>WebControls</Name>
@ -270,5 +260,9 @@
<Project>{88D83FC9-4158-4435-98A6-1F8F7F448B8F}</Project>
<Name>ITContent</Name>
</ProjectReference>
<ProjectReference Include="..\yavscModel\YavscModel.csproj">
<Project>{68F5B80A-616E-4C3C-91A0-828AA40000BD}</Project>
<Name>YavscModel</Name>
</ProjectReference>
</ItemGroup>
</Project>