* AccountController.cs: Code formatting

* Web.csproj: cleanning

* Web.config: Yavsc.Model.Circles in imported namespaces

* Circles.aspx: Allow Circle view to handle null model
vnext
Paul Schneider 9 years ago
parent 7fc21f1056
commit bacd124a78
5 changed files with 20 additions and 4 deletions

@ -1,3 +1,13 @@
2015-06-12 Paul Schneider <paul@pschneider.fr>
* AccountController.cs: Code formatting
* Web.csproj: cleanning
* Web.config: Yavsc.Model.Circles in imported namespaces
* Circles.aspx: Allow Circle view to handle null model
2015-06-12 Paul Schneider <paul@pschneider.fr>
* Web.csproj:

@ -297,7 +297,9 @@ namespace Yavsc.Controllers
[Authorize]
public ActionResult Circles ()
{
return View (CircleManager.DefaultProvider.List (Membership.GetUser().UserName));
string user = Membership.GetUser ().UserName;
CircleInfoCollection cic = CircleManager.DefaultProvider.List (user);
return View (cic);
}
/// <summary>
/// Logout the specified returnUrl.

@ -4,11 +4,15 @@
<asp:Content ID="headContent" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
<% foreach (CircleInfo ci in model) { %>
<% if (Model==null) { %>
No circle yet
<% } else { %>
<% foreach (CircleInfo ci in Model) { %>
<%= ci.Title %>
<%= ci.Id %>
<br/>
<% } %>
<% }} %>
</asp:Content>
<asp:Content ID="MASContentContent" ContentPlaceHolderID="MASContent" runat="server">
</asp:Content>

@ -29,6 +29,7 @@
<add namespace="Yavsc.Model.WorkFlow" />
<add namespace="Yavsc.Model.Google" />
<add namespace="Yavsc.Model.FrontOffice" />
<add namespace="Yavsc.Model.Circles" />
</namespaces>
</pages>

@ -126,7 +126,6 @@
<Folder Include="Views\PayPal\" />
<Folder Include="ApiControllers\" />
<Folder Include="Views\Modules\" />
<Folder Include="Views\Circle\" />
</ItemGroup>
<ItemGroup>
<Compile Include="Controllers\HomeController.cs" />

Loading…