diff --git a/ITContent/IITContent.cs b/ITContent/IITContent.cs index ccf5999f..ecf95d69 100644 --- a/ITContent/IITContent.cs +++ b/ITContent/IITContent.cs @@ -1,6 +1,6 @@ using System; using WorkFlowProvider; -using yavscModel.WorkFlow; +using Yavsc.Model.WorkFlow; namespace ITContent { diff --git a/ITContent/ITContent.csproj b/ITContent/ITContent.csproj index 77e6106c..870e9e5d 100644 --- a/ITContent/ITContent.csproj +++ b/ITContent/ITContent.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {88D83FC9-4158-4435-98A6-1F8F7F448B8F} Library @@ -41,9 +41,9 @@ {821FF72D-9F4B-4A2C-B95C-7B965291F119} WorkFlowProvider - + {68F5B80A-616E-4C3C-91A0-828AA40000BD} - yavscModel + YavscModel \ No newline at end of file diff --git a/ITContentProvider/ITContentProvider.csproj b/ITContentProvider/ITContentProvider.csproj index 6a2608b8..10533cbf 100644 --- a/ITContentProvider/ITContentProvider.csproj +++ b/ITContentProvider/ITContentProvider.csproj @@ -45,9 +45,9 @@ {821FF72D-9F4B-4A2C-B95C-7B965291F119} WorkFlowProvider - + {68F5B80A-616E-4C3C-91A0-828AA40000BD} - yavscModel + YavscModel \ No newline at end of file diff --git a/NpgsqlBlogProvider/BlogHelper.cs b/NpgsqlBlogProvider/BlogHelper.cs index aa4f8e76..5aac81d0 100644 --- a/NpgsqlBlogProvider/BlogHelper.cs +++ b/NpgsqlBlogProvider/BlogHelper.cs @@ -3,7 +3,7 @@ using System.Configuration; using System.Reflection; using System.Collections.Specialized; using Npgsql.Web.Blog.Configuration; -using yavscModel.Blogs; +using Yavsc.Model.Blogs; namespace Npgsql.Web.Blog { diff --git a/NpgsqlBlogProvider/BlogManager.cs b/NpgsqlBlogProvider/BlogManager.cs index b92f2690..cc987927 100644 --- a/NpgsqlBlogProvider/BlogManager.cs +++ b/NpgsqlBlogProvider/BlogManager.cs @@ -1,5 +1,5 @@ using System; -using yavscModel.Blogs; +using Yavsc.Model.Blogs; namespace Npgsql.Web.Blog diff --git a/NpgsqlBlogProvider/BlogProvider.cs b/NpgsqlBlogProvider/BlogProvider.cs index 76314bfc..d1ff20de 100644 --- a/NpgsqlBlogProvider/BlogProvider.cs +++ b/NpgsqlBlogProvider/BlogProvider.cs @@ -3,7 +3,7 @@ using System.Configuration; using System.Configuration.Provider; using System.Collections.Generic; -namespace yavscModel.Blogs +namespace Yavsc.Model.Blogs { public abstract class BlogProvider: ProviderBase { diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs index 9422dd88..39cf5eab 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs @@ -3,7 +3,7 @@ using System.Configuration; using System.Configuration.Provider; using Npgsql; using System.Collections.Generic; -using yavscModel.Blogs; +using Yavsc.Model.Blogs; namespace Npgsql.Web.Blog { diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj index c62f33dd..70a0e7bf 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj @@ -62,9 +62,9 @@ - + {68F5B80A-616E-4C3C-91A0-828AA40000BD} - yavscModel + YavscModel \ No newline at end of file diff --git a/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj b/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj index 797f8539..e57cfed7 100644 --- a/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj +++ b/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {BBA7175D-7F92-4278-96FC-84C495A2B5A6} Library diff --git a/SalesCatalog/SalesCatalog.csproj b/SalesCatalog/SalesCatalog.csproj index 9e10e684..ed2eb8bd 100644 --- a/SalesCatalog/SalesCatalog.csproj +++ b/SalesCatalog/SalesCatalog.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {90BF2234-7252-4CD5-B2A4-17501B19279B} Library @@ -32,13 +32,11 @@ - False + nunit - - False - + diff --git a/WebControls/WebControls.csproj b/WebControls/WebControls.csproj index f81a2a3a..80ea0d58 100644 --- a/WebControls/WebControls.csproj +++ b/WebControls/WebControls.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356} Library @@ -30,12 +30,8 @@ - - False - - - False - + + diff --git a/WorkFlowProvider/NpgsqlContentProvider.cs b/WorkFlowProvider/NpgsqlContentProvider.cs index 80a173a7..791ae821 100644 --- a/WorkFlowProvider/NpgsqlContentProvider.cs +++ b/WorkFlowProvider/NpgsqlContentProvider.cs @@ -3,7 +3,7 @@ using Npgsql; using NpgsqlTypes; using System.Configuration; using System.Collections.Specialized; -using yavscModel.WorkFlow; +using Yavsc.Model.WorkFlow; using System.Web.Mvc; using System.Configuration.Provider; using System.Collections.Generic; diff --git a/WorkFlowProvider/WFManager.cs b/WorkFlowProvider/WFManager.cs index 5a48f513..ee78627a 100644 --- a/WorkFlowProvider/WFManager.cs +++ b/WorkFlowProvider/WFManager.cs @@ -1,5 +1,5 @@ using System; -using yavscModel.WorkFlow; +using Yavsc.Model.WorkFlow; using System.Configuration; using WorkFlowProvider.Configuration; using System.Collections.Specialized; diff --git a/WorkFlowProvider/WorkFlowProvider.csproj b/WorkFlowProvider/WorkFlowProvider.csproj index 7d479db1..a202af3c 100644 --- a/WorkFlowProvider/WorkFlowProvider.csproj +++ b/WorkFlowProvider/WorkFlowProvider.csproj @@ -45,9 +45,9 @@ - + {68F5B80A-616E-4C3C-91A0-828AA40000BD} - yavscModel + YavscModel diff --git a/Yavsc.sln b/Yavsc.sln index bbfaa708..c39e2022 100644 --- a/Yavsc.sln +++ b/Yavsc.sln @@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NpgsqlBlogProvider", "Npgsq EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SalesCatalog", "SalesCatalog\SalesCatalog.csproj", "{90BF2234-7252-4CD5-B2A4-17501B19279B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "yavscModel", "yavscModel\yavscModel.csproj", "{68F5B80A-616E-4C3C-91A0-828AA40000BD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YavscModel", "yavscModel\YavscModel.csproj", "{68F5B80A-616E-4C3C-91A0-828AA40000BD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkFlowProvider", "WorkFlowProvider\WorkFlowProvider.csproj", "{821FF72D-9F4B-4A2C-B95C-7B965291F119}" EndProject diff --git a/vscadm/vscadm.csproj b/vscadm/vscadm.csproj index ffbd3755..f4bbf758 100644 --- a/vscadm/vscadm.csproj +++ b/vscadm/vscadm.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {6C5E1490-E141-4ADA-84E5-6D65523D6B73} Exe diff --git a/web/Admin/DataManager.cs b/web/Admin/DataManager.cs index cc24a375..c3650d21 100644 --- a/web/Admin/DataManager.cs +++ b/web/Admin/DataManager.cs @@ -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 diff --git a/web/Basket/Basket.cs b/web/Basket/Basket.cs deleted file mode 100644 index bcfb9ec3..00000000 --- a/web/Basket/Basket.cs +++ /dev/null @@ -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) - { - } - } -} diff --git a/web/Controllers/AccountController.cs b/web/Controllers/AccountController.cs index 61f6e527..e0c50fda 100644 --- a/web/Controllers/AccountController.cs +++ b/web/Controllers/AccountController.cs @@ -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 diff --git a/web/Controllers/AdminController.cs b/web/Controllers/AdminController.cs index 7b40c0ae..311d3e01 100644 --- a/web/Controllers/AdminController.cs +++ b/web/Controllers/AdminController.cs @@ -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 { diff --git a/web/Controllers/BackOfficeController.cs b/web/Controllers/BackOfficeController.cs index 555c56db..ede9f896 100644 --- a/web/Controllers/BackOfficeController.cs +++ b/web/Controllers/BackOfficeController.cs @@ -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*/ } } diff --git a/web/Controllers/BasketController.cs b/web/Controllers/BasketController.cs index 4aef0999..8dd99552 100644 --- a/web/Controllers/BasketController.cs +++ b/web/Controllers/BasketController.cs @@ -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 { diff --git a/web/Controllers/BlogsApiController.cs b/web/Controllers/BlogsApiController.cs index 103d3f68..1ad9763a 100644 --- a/web/Controllers/BlogsApiController.cs +++ b/web/Controllers/BlogsApiController.cs @@ -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) { diff --git a/web/Controllers/BlogsController.cs b/web/Controllers/BlogsController.cs index 69807420..c32822fe 100644 --- a/web/Controllers/BlogsController.cs +++ b/web/Controllers/BlogsController.cs @@ -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) diff --git a/web/Controllers/Commande.cs b/web/Controllers/Commande.cs deleted file mode 100644 index 007dec84..00000000 --- a/web/Controllers/Commande.cs +++ /dev/null @@ -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) - { - - } - } -} - diff --git a/web/Controllers/FileSystemController.cs b/web/Controllers/FileSystemController.cs index 310808c3..63966dea 100644 --- a/web/Controllers/FileSystemController.cs +++ b/web/Controllers/FileSystemController.cs @@ -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 diff --git a/web/Controllers/FrontOfficeApiController.cs b/web/Controllers/FrontOfficeApiController.cs index 0887c020..830f65b3 100644 --- a/web/Controllers/FrontOfficeApiController.cs +++ b/web/Controllers/FrontOfficeApiController.cs @@ -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] diff --git a/web/Controllers/FrontOfficeController.cs b/web/Controllers/FrontOfficeController.cs index 6242c160..1518e7e2 100644 --- a/web/Controllers/FrontOfficeController.cs +++ b/web/Controllers/FrontOfficeController.cs @@ -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; diff --git a/web/Controllers/WorkFlowController.cs b/web/Controllers/WorkFlowController.cs index b3372ee9..6e06f6c4 100644 --- a/web/Controllers/WorkFlowController.cs +++ b/web/Controllers/WorkFlowController.cs @@ -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); diff --git a/web/Views/RegisterPage.cs b/web/Views/RegisterPage.cs index 7215e9f5..695b7f5a 100644 --- a/web/Views/RegisterPage.cs +++ b/web/Views/RegisterPage.cs @@ -1,6 +1,6 @@ using System; using System.Web.UI.WebControls; -using yavscModel.RolesAndMembers; +using Yavsc.Model.RolesAndMembers; namespace Yavsc diff --git a/web/Views/Web.config b/web/Views/Web.config index a1931a83..d1ce58e9 100644 --- a/web/Views/Web.config +++ b/web/Views/Web.config @@ -21,13 +21,13 @@ - + - - - + + + diff --git a/web/Web.config b/web/Web.config index 4571a866..3612e3b1 100644 --- a/web/Web.config +++ b/web/Web.config @@ -65,9 +65,10 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx - + +