* Estimate.aspx: from backoffice
* CatalogManager.cs: Uses GetDefaultProvider * Catalog.cs: the Catalog object now should support a unique id in the system : UID, exposed as one of its properties. * AccountController.cs: new static method te get an user profile by its name. * AdminController.cs: Uses the Yavsc.Admin namespace (refactoring) * Web.csproj: * BlogManager.cs: * BackOfficeController.cs: refactoring * BlogsController.cs: Fixes the Blog title * FrontOfficeController.cs: Changes on the go for the Command object * AddRole.aspx: minor syntax change * UserPosts.aspx: show the blog title * style.css: black transparent for the background of posts * Profile.cs: Method FromProfileBase became a constructor * Commande.cs: nothing * Estimate.aspx: moved to the frontoffice views * CatalogHelper.cs: Writting GetDefaultProvider
This commit is contained in:
parent
b5d19c5da6
commit
c22be7f6b5
17 changed files with 104 additions and 46 deletions
|
|
@ -38,11 +38,16 @@ namespace Yavsc.Controllers
|
|||
return View ();
|
||||
}
|
||||
|
||||
public static Profile GetProfile (string user)
|
||||
{
|
||||
return new Profile (ProfileBase.Create (user));
|
||||
}
|
||||
|
||||
[Authorize]
|
||||
public ActionResult Profile(Profile model)
|
||||
{
|
||||
ViewData ["UserName"] = Membership.GetUser ().UserName;
|
||||
model.FromProfileBase(HttpContext.Profile);
|
||||
model = GetProfile ((string)ViewData ["UserName"]);
|
||||
return View (model);
|
||||
}
|
||||
// TODO [ValidateAntiForgeryToken]
|
||||
|
|
|
|||
|
|
@ -7,9 +7,15 @@ using System.Web.Mvc.Ajax;
|
|||
using System.Web.Security;
|
||||
using Yavsc.Model.RolesAndMembers;
|
||||
using Yavsc.Model.Admin;
|
||||
using Yavsc.Admin;
|
||||
|
||||
|
||||
namespace Yavsc.Controllers
|
||||
{
|
||||
/// <summary>
|
||||
/// Admin controller.
|
||||
/// Only Admin members should be allowed to use it.
|
||||
/// </summary>
|
||||
public class AdminController : Controller
|
||||
{
|
||||
[Authorize(Roles="Admin")]
|
||||
|
|
|
|||
|
|
@ -10,12 +10,10 @@ namespace Yavsc.Controllers
|
|||
{
|
||||
public class BackOfficeController : Controller
|
||||
{
|
||||
public ActionResult Estimate()
|
||||
{
|
||||
}
|
||||
|
||||
public ActionResult Index ()
|
||||
[Authorize(Roles="Admin,Providers")]
|
||||
public ActionResult Index()
|
||||
{
|
||||
return View ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ using Yavsc;
|
|||
using Yavsc.Model;
|
||||
using Yavsc.Model.Blogs;
|
||||
using Yavsc.ApiControllers;
|
||||
using Yavsc.Model.RolesAndMembers;
|
||||
|
||||
namespace Yavsc.Controllers
|
||||
{
|
||||
|
|
@ -82,7 +83,9 @@ namespace Yavsc.Controllers
|
|||
if (u.UserName == user)
|
||||
sf |= FindBlogEntryFlags.MatchInvisible;
|
||||
BlogEntryCollection c = BlogManager.FindPost (user, sf, pageIndex, pageSize, out tr);
|
||||
ViewData ["BlogTitle"] = BlogTitle (user);
|
||||
Profile bupr = AccountController.GetProfile (user);
|
||||
ViewData ["BlogUserProfile"] = bupr;
|
||||
ViewData ["BlogTitle"] = bupr.BlogTitle;
|
||||
ViewData ["PageIndex"] = pageIndex;
|
||||
ViewData ["PageSize"] = pageSize;
|
||||
ViewData ["RecordCount"] = tr;
|
||||
|
|
@ -109,16 +112,23 @@ namespace Yavsc.Controllers
|
|||
{
|
||||
if (e == null)
|
||||
return View ("TitleNotFound");
|
||||
Profile pr = AccountController.GetProfile (e.UserName);
|
||||
if (pr==null)
|
||||
return View ("TitleNotFound");
|
||||
ViewData ["BlogUserProfile"] = pr;
|
||||
ViewData ["BlogTitle"] = pr.BlogTitle;
|
||||
MembershipUser u = Membership.GetUser ();
|
||||
if (u != null)
|
||||
ViewData ["UserName"] = u.UserName;
|
||||
if (!e.Visible) {
|
||||
if (!e.Visible || !pr.BlogVisible) {
|
||||
if (u==null)
|
||||
return View ("TitleNotFound");
|
||||
else if (u.UserName!=e.UserName)
|
||||
else {
|
||||
if (u.UserName!=e.UserName)
|
||||
if (!Roles.IsUserInRole(u.UserName,"Admin"))
|
||||
return View ("TitleNotFound");
|
||||
}
|
||||
}
|
||||
ViewData ["BlogTitle"] = BlogTitle (e.UserName);
|
||||
ViewData ["Comments"] = BlogManager.GetComments (e.Id);
|
||||
return View ("UserPost", e);
|
||||
}
|
||||
|
|
@ -183,7 +193,9 @@ namespace Yavsc.Controllers
|
|||
{
|
||||
if (model != null) {
|
||||
string user = Membership.GetUser ().UserName;
|
||||
ViewData ["BlogTitle"] = this.BlogTitle (user);
|
||||
Profile pr = new Profile (HttpContext.Profile);
|
||||
|
||||
ViewData ["BlogTitle"] = pr.BlogTitle;
|
||||
ViewData ["UserName"] = user;
|
||||
if (model.UserName == null) {
|
||||
model.UserName = user;
|
||||
|
|
@ -202,10 +214,6 @@ namespace Yavsc.Controllers
|
|||
return View (model);
|
||||
}
|
||||
|
||||
private string BlogTitle (string user)
|
||||
{
|
||||
return string.Format ("{0}'s blog", user);
|
||||
}
|
||||
|
||||
[Authorize]
|
||||
public ActionResult Comment (BlogEditCommentModel model) {
|
||||
|
|
|
|||
|
|
@ -14,6 +14,10 @@ using System.Web.Security;
|
|||
|
||||
namespace Yavsc.Controllers
|
||||
{
|
||||
/// <summary>
|
||||
/// Front office controller.
|
||||
/// Access granted to all
|
||||
/// </summary>
|
||||
public class FrontOfficeController : Controller
|
||||
{
|
||||
[HttpGet]
|
||||
|
|
@ -133,7 +137,7 @@ namespace Yavsc.Controllers
|
|||
Session["Basket"]=new List<Commande>();
|
||||
List<Commande> basket = Session["Basket"] as List<Commande>;
|
||||
// Add specified product command to the basket,
|
||||
basket.Add(new Commande(collection));
|
||||
basket.Add(new Commande(0,0,collection));
|
||||
return View (collection);
|
||||
} catch (Exception e) {
|
||||
ViewData ["Message"] = "Exception:"+e.Message;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
|
||||
<%= Html.ValidationSummary() %>
|
||||
<% using(Html.BeginForm("DoAddRole")) %>
|
||||
<% { %>
|
||||
<% using(Html.BeginForm("DoAddRole"))
|
||||
{ %>
|
||||
Nom du rôle :
|
||||
<%= Html.TextBox( "RoleName" ) %>
|
||||
<%= Html.ValidationMessage("RoleName", "*") %><br/>
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<title></title>
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<%@ Page Title="Billets utilisateurs" Language="C#" Inherits="System.Web.Mvc.ViewPage<BlogEntryCollection>" MasterPageFile="~/Models/App.master"%>
|
||||
<%@ Register Assembly="Yavsc.WebControls" TagPrefix="yavsc" Namespace="Yavsc.WebControls" %>
|
||||
<asp:Content ContentPlaceHolderID="init" ID="init1" runat="server">
|
||||
<% Title = ((string) ViewData["BlogTitle"])+" - "+YavscHelpers.SiteName ; %>
|
||||
<% Title = ((string) ((Profile)ViewData["BlogUserProfile"]).BlogTitle)+" - "+YavscHelpers.SiteName ; %>
|
||||
</asp:Content>
|
||||
<asp:Content ContentPlaceHolderID="overHeaderOne" ID="header1" runat="server">
|
||||
<h1 class="blogtitle"><a href="/Blog/<%=ViewData["BlogUser"]%>">
|
||||
|
|
|
|||
19
web/Views/FrontOffice/Estimate.aspx
Normal file
19
web/Views/FrontOffice/Estimate.aspx
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
<%@ Page Title="" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %>
|
||||
<!-- <asp:Content ContentPlaceHolderID="init" ID="initContent" runat="server">
|
||||
</asp:Content>
|
||||
<asp:Content ContentPlaceHolderID="overHeaderOne" ID="overHeaderOneContent" runat="server">
|
||||
</asp:Content>
|
||||
<asp:Content ContentPlaceHolderID="header" ID="headerContent" runat="server">
|
||||
</asp:Content> -->
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
<% using (Html.BeginForm("Estimate")) { %>
|
||||
|
||||
<% } %>
|
||||
|
||||
</asp:Content>
|
||||
<!--
|
||||
<asp:Content ContentPlaceHolderID="MASContent" ID="MASContentContent" runat="server">
|
||||
</asp:Content>
|
||||
-->
|
||||
|
||||
|
||||
|
|
@ -188,13 +188,13 @@
|
|||
<Content Include="Views\Admin\RemoveRoleQuery.aspx" />
|
||||
<Content Include="Views\Admin\RemoveUserQuery.aspx" />
|
||||
<Content Include="Views\Admin\RoleList.aspx" />
|
||||
<Content Include="Views\BackOffice\Estimate.aspx" />
|
||||
<Content Include="Views\Admin\CreateBackup.aspx" />
|
||||
<Content Include="Views\Admin\BackupCreated.aspx" />
|
||||
<Content Include="Views\Admin\Backups.aspx" />
|
||||
<Content Include="Views\Admin\Restore.aspx" />
|
||||
<Content Include="Views\Admin\Restored.aspx" />
|
||||
<Content Include="Views\Admin\Index.aspx" />
|
||||
<Content Include="Views\FrontOffice\Estimate.aspx" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ label {
|
|||
font-size: small;
|
||||
}
|
||||
.blogpost {
|
||||
background-color: rgba(32,32,32,0.3);
|
||||
background-color: rgba(0,0,0,0.5);
|
||||
}
|
||||
.editblog {
|
||||
width: 95%;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue