mirror of
https://gitlab.com/buildfeed/BuildFeed.git
synced 2024-03-22 21:10:34 +08:00
Misc bug fixes
This commit is contained in:
Thomas Hounsell
parent
b43a16c3d3
commit
76c20d5731
|
|
@ -15,10 +15,12 @@ public class frontController : Controller
|
|||
public const int PAGE_SIZE = 96;
|
||||
|
||||
private Build bModel;
|
||||
private MetaItem mModel;
|
||||
|
||||
public frontController() : base()
|
||||
{
|
||||
bModel = new Build();
|
||||
mModel = new MetaItem();
|
||||
}
|
||||
|
||||
[Route("", Order = 1)]
|
||||
|
|
@ -125,7 +127,7 @@ public async Task<ActionResult> twitterCard(Guid id)
|
|||
#endif
|
||||
public async Task<ActionResult> viewLabPage(string lab, int page)
|
||||
{
|
||||
ViewBag.MetaItem = new MetaItem().SelectById(new MetaItemKey
|
||||
ViewBag.MetaItem = await mModel.SelectById(new MetaItemKey
|
||||
{
|
||||
Type = MetaType.Lab,
|
||||
Value = lab
|
||||
|
|
@ -157,7 +159,7 @@ public async Task<ActionResult> viewLabPage(string lab, int page)
|
|||
#endif
|
||||
public async Task<ActionResult> viewSourcePage(TypeOfSource source, int page)
|
||||
{
|
||||
ViewBag.MetaItem = new MetaItem().SelectById(new MetaItemKey
|
||||
ViewBag.MetaItem = await mModel.SelectById(new MetaItemKey
|
||||
{
|
||||
Type = MetaType.Source,
|
||||
Value = source.ToString()
|
||||
|
|
@ -189,7 +191,7 @@ public async Task<ActionResult> viewSourcePage(TypeOfSource source, int page)
|
|||
#endif
|
||||
public async Task<ActionResult> viewYearPage(int year, int page)
|
||||
{
|
||||
ViewBag.MetaItem = new MetaItem().SelectById(new MetaItemKey
|
||||
ViewBag.MetaItem = await mModel.SelectById(new MetaItemKey
|
||||
{
|
||||
Type = MetaType.Year,
|
||||
Value = year.ToString()
|
||||
|
|
@ -222,7 +224,7 @@ public async Task<ActionResult> viewYearPage(int year, int page)
|
|||
public async Task<ActionResult> viewVersionPage(int major, int minor, int page)
|
||||
{
|
||||
string valueString = $"{major}.{minor}";
|
||||
ViewBag.MetaItem = new MetaItem().SelectById(new MetaItemKey
|
||||
ViewBag.MetaItem = await mModel.SelectById(new MetaItemKey
|
||||
{
|
||||
Type = MetaType.Version,
|
||||
Value = valueString
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ public async Task<ActionResult> flight(LevelOfFlight id)
|
|||
[Route("rss/lab/{lab}")]
|
||||
public async Task<ActionResult> lab(string lab)
|
||||
{
|
||||
var builds = await bModel.SelectLab(lab, RSS_SIZE, 0);
|
||||
var builds = await bModel.SelectLab(lab, 0, RSS_SIZE);
|
||||
|
||||
|
||||
RssDocument rdoc = new RssDocument()
|
||||
|
|
|
|||
|
|
@ -153,8 +153,8 @@ public async Task<List<BuildModel>> SelectLatest(int limit, int skip)
|
|||
[DataObjectMethod(DataObjectMethodType.Select, true)]
|
||||
public async Task<List<BuildModel>> SelectLatestLeaked(int limit, int skip)
|
||||
{
|
||||
return await _buildCollection.Find(b => b.Added != null)
|
||||
.SortByDescending(b => b.Added)
|
||||
return await _buildCollection.Find(b => b.LeakDate != null)
|
||||
.SortByDescending(b => b.LeakDate)
|
||||
.Skip(skip)
|
||||
.Limit(limit)
|
||||
.ToListAsync();
|
||||
|
|
|
|||
|
|
@ -15,16 +15,17 @@
|
|||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<dl class="credits-list">
|
||||
<dt>Arabic Translation</dt>
|
||||
<dt>Arabic (@System.Globalization.CultureInfo.GetCultureInfo("ar").NativeName) Translation</dt>
|
||||
<dd>Ahmed (airportsfan) <a href="https://twitter.com/airportsfan"><i class="fa fa-twitter"></i></a></dd>
|
||||
<dt>Bengali (@System.Globalization.CultureInfo.GetCultureInfo("bn").NativeName) Translation</dt>
|
||||
<dd>Mehedi Hassan <a href="https://twitter.com/mehedih_"><i class="fa fa-twitter"></i></a></dd>
|
||||
<dt>Czech (@System.Globalization.CultureInfo.GetCultureInfo("cs").NativeName) Translation</dt>
|
||||
<dd>David (rezedus) <a href="https://twitter.com/rezedus"><i class="fa fa-twitter"></i></a></dd>
|
||||
<dt>German (@System.Globalization.CultureInfo.GetCultureInfo("de").NativeName) Translation</dt>
|
||||
<dd>?</dd>
|
||||
<dd>The Dhel <a href="https://twitter.com/The_Dhel"><i class="fa fa-twitter"></i></a></dd>
|
||||
<dd>Christopher <a href="https://twitter.com/evil_pro_"><i class="fa fa-twitter"></i></a></dd>
|
||||
<dt>Greek (@System.Globalization.CultureInfo.GetCultureInfo("el").NativeName) Translation</dt>
|
||||
<dd>Hackerpcs</dd>
|
||||
<dd>Hacker?pcs</dd>
|
||||
<dt>Spanish (@System.Globalization.CultureInfo.GetCultureInfo("es").NativeName) Translation</dt>
|
||||
<dd>OBattler</dd>
|
||||
<dt>Finnish (@System.Globalization.CultureInfo.GetCultureInfo("fi").NativeName) Translation</dt>
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
@{
|
||||
ViewBag.Title = string.Format("{0} | {1}", BuildFeed.Local.Common.RssFeeds, BuildFeed.Local.Common.SiteName);
|
||||
ViewBag.Title = string.Format("{0} | {1}", BuildFeed.Local.Common.RssFeeds, BuildFeed.Local.Common.SiteName);
|
||||
}
|
||||
|
||||
<h2>@BuildFeed.Local.Common.RssFeeds</h2>
|
||||
|
||||
<ul>
|
||||
<li><a href="@Url.Action("index", new { controller = "rss" })" title="@BuildFeed.Local.Support.RecentlyCompiled"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.RecentlyCompiled</a></li>
|
||||
<li><a href="@Url.Action("leaked", new { controller = "rss" })" title="@BuildFeed.Local.Support.RecentlyLeaked"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.RecentlyLeaked</a></li>
|
||||
<li><a href="@Url.Action("added", new { controller = "rss" })" title="@BuildFeed.Local.Support.RecentlyAdded"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.RecentlyAdded</a></li>
|
||||
<li><a href="@Url.Action("version", new { controller = "rss" })" title="@BuildFeed.Local.Support.HighestVersion"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.HighestVersion</a></li>
|
||||
<li>
|
||||
@BuildFeed.Local.Model.FlightLevel
|
||||
<ul>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "wis" })" title="@BuildFeed.Local.Model.FlightWIS"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightWIS</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "wif" })" title="@BuildFeed.Local.Model.FlightWIF"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightWIF</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "osg" })" title="@BuildFeed.Local.Model.FlightOSG"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightOSG</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "msit" })" title="@BuildFeed.Local.Model.FlightMSIT"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightMSIT</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "canary" })" title="@BuildFeed.Local.Model.FlightCanary"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightCanary</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#rss-labs" data-toggle="collapse">@BuildFeed.Local.Model.Lab</a>
|
||||
<ul id="rss-labs" class="collapse">
|
||||
@foreach (string lab in ViewBag.Labs)
|
||||
{
|
||||
<li><a href="@Url.Action("lab", new { controller = "rss", lab = lab })" title="@lab"><i class="fa fa-sm fa-rss"></i> @lab</a></li>
|
||||
}
|
||||
</ul>
|
||||
</li>
|
||||
<li><a href="@Url.Action("index", new { controller = "rss" })" title="@BuildFeed.Local.Support.RecentlyCompiled"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.RecentlyCompiled</a></li>
|
||||
<li><a href="@Url.Action("leaked", new { controller = "rss" })" title="@BuildFeed.Local.Support.RecentlyLeaked"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.RecentlyLeaked</a></li>
|
||||
<li><a href="@Url.Action("added", new { controller = "rss" })" title="@BuildFeed.Local.Support.RecentlyAdded"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.RecentlyAdded</a></li>
|
||||
<li><a href="@Url.Action("version", new { controller = "rss" })" title="@BuildFeed.Local.Support.HighestVersion"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.HighestVersion</a></li>
|
||||
<li>
|
||||
@BuildFeed.Local.Model.FlightLevel
|
||||
<ul>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "wis" })" title="@BuildFeed.Local.Model.FlightWIS"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightWIS</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "wif" })" title="@BuildFeed.Local.Model.FlightWIF"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightWIF</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "osg" })" title="@BuildFeed.Local.Model.FlightOSG"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightOSG</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "msit" })" title="@BuildFeed.Local.Model.FlightMSIT"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightMSIT</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "canary" })" title="@BuildFeed.Local.Model.FlightCanary"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightCanary</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#rss-labs" data-toggle="collapse">@BuildFeed.Local.Model.Lab</a>
|
||||
<ul id="rss-labs" class="collapse">
|
||||
@foreach (string lab in ViewBag.Labs)
|
||||
{
|
||||
<li><a href="@Url.Action("lab", new { controller = "rss", lab = lab })" title="@lab"><i class="fa fa-sm fa-rss"></i> @lab</a></li>
|
||||
}
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
@ -1,94 +1,96 @@
|
|||
@model BuildFeed.Models.ViewModel.SitemapData
|
||||
@{
|
||||
ViewBag.Title = string.Format("{0} | {1}", BuildFeed.Local.Common.Sitemap, BuildFeed.Local.Common.SiteName);
|
||||
ViewBag.Title = string.Format("{0} | {1}", BuildFeed.Local.Common.Sitemap, BuildFeed.Local.Common.SiteName);
|
||||
}
|
||||
|
||||
<h2>@BuildFeed.Local.Common.Sitemap</h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
@Html.ActionLink("BuildFeed", "index", "build")
|
||||
<ul>
|
||||
<li>
|
||||
<a href="#sitemap-builds" data-toggle="collapse">Builds</a>
|
||||
<ul id="sitemap-builds" class="collapse">
|
||||
@foreach (var buildGroup in Model.Builds)
|
||||
{
|
||||
<li>
|
||||
@Html.ActionLink(buildGroup.Id.ToString(), "viewGroup", new { controller = "front", major = buildGroup.Id.Major, minor = buildGroup.Id.Minor, number = buildGroup.Id.Build, revision = buildGroup.Id.Revision })
|
||||
<ul>
|
||||
@foreach (var build in buildGroup.Builds)
|
||||
{
|
||||
<li>@Html.ActionLink(build.Name, "viewBuild", new { controller = "front", id = build.Id })</li>
|
||||
}
|
||||
</ul>
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
@foreach (var item in Model.Actions)
|
||||
{
|
||||
<li>
|
||||
<a href="#sitemap-@item.Key.ToLower()" data-toggle="collapse">@item.Key</a>
|
||||
<ul id="sitemap-@item.Key.ToLower()" class="collapse">
|
||||
@foreach (var action in item.Value)
|
||||
<li>
|
||||
@Html.ActionLink("BuildFeed", "index", "build")
|
||||
<ul>
|
||||
<li>
|
||||
<a href="#sitemap-builds" data-toggle="collapse">Builds</a>
|
||||
<ul id="sitemap-builds" class="collapse">
|
||||
@foreach (var buildGroup in Model.Builds)
|
||||
{
|
||||
<li>
|
||||
@Html.ActionLink(buildGroup.Id.ToString(), "viewGroup", new { controller = "front", major = buildGroup.Id.Major, minor = buildGroup.Id.Minor, number = buildGroup.Id.Build, revision = buildGroup.Id.Revision })
|
||||
<ul>
|
||||
@foreach (var build in buildGroup.Builds)
|
||||
{
|
||||
if (string.IsNullOrEmpty(action.Name))
|
||||
{
|
||||
<li>@Html.ActionLink("Page 1", action.Action, action.UrlParams)</li>
|
||||
for (int i = 2; i <= action.Pages; i++)
|
||||
{
|
||||
var urlParams = action.UrlParams;
|
||||
urlParams["page"] = i;
|
||||
<li>@Html.ActionLink("Page " + i.ToString(), action.Action + "Page", urlParams)</li>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
<li>
|
||||
<a href="#sitemap-@action.UniqueId" data-toggle="collapse">@action.Name</a>
|
||||
<ul id="sitemap-@action.UniqueId" class="collapse">
|
||||
<li>@Html.ActionLink("Page 1", action.Action, action.UrlParams)</li>
|
||||
@for (int i = 2; i <= action.Pages; i++)
|
||||
{
|
||||
var urlParams = action.UrlParams;
|
||||
urlParams["page"] = i;
|
||||
<li>@Html.ActionLink("Page " + i.ToString(), action.Action + "Page", urlParams)</li>
|
||||
}
|
||||
</ul>
|
||||
</li>
|
||||
}
|
||||
<li>@Html.ActionLink(build.Name, "viewBuild", new { controller = "front", id = build.Id })</li>
|
||||
}
|
||||
</ul>
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
@foreach (var item in Model.Actions)
|
||||
{
|
||||
<li>
|
||||
<a href="#sitemap-rss" data-toggle="collapse">@BuildFeed.Local.Common.RssFeeds</a>
|
||||
<ul id="sitemap-rss" class="collapse">
|
||||
<li><a href="@Url.Action("index", new { controller = "rss" })" title="@BuildFeed.Local.Support.RecentlyCompiled"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.RecentlyCompiled</a></li>
|
||||
<li><a href="@Url.Action("leaked", new { controller = "rss" })" title="@BuildFeed.Local.Support.RecentlyLeaked"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.RecentlyLeaked</a></li>
|
||||
<li><a href="@Url.Action("added", new { controller = "rss" })" title="@BuildFeed.Local.Support.RecentlyAdded"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.RecentlyAdded</a></li>
|
||||
<li><a href="@Url.Action("version", new { controller = "rss" })" title="@BuildFeed.Local.Support.HighestVersion"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.HighestVersion</a></li>
|
||||
<li>
|
||||
@BuildFeed.Local.Model.FlightLevel
|
||||
<ul>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "low" })" title="@BuildFeed.Local.Model.FlightLow"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightLow</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "medium" })" title="@BuildFeed.Local.Model.FlightMedium"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightMedium</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "high" })" title="@BuildFeed.Local.Model.FlightHigh"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightHigh</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#rss-labs" data-toggle="collapse">@BuildFeed.Local.Model.Lab</a>
|
||||
<ul id="rss-labs" class="collapse">
|
||||
@foreach (string lab in Model.Labs)
|
||||
{
|
||||
<li><a href="@Url.Action("lab", new { controller = "rss", lab = lab })" title="@lab"><i class="fa fa-sm fa-rss"></i> @lab</a></li>
|
||||
}
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
<a href="#sitemap-@item.Key.ToLower()" data-toggle="collapse">@item.Key</a>
|
||||
<ul id="sitemap-@item.Key.ToLower()" class="collapse">
|
||||
@foreach (var action in item.Value)
|
||||
{
|
||||
if (string.IsNullOrEmpty(action.Name))
|
||||
{
|
||||
<li>@Html.ActionLink("Page 1", action.Action, action.UrlParams)</li>
|
||||
for (int i = 2; i <= action.Pages; i++)
|
||||
{
|
||||
var urlParams = action.UrlParams;
|
||||
urlParams["page"] = i;
|
||||
<li>@Html.ActionLink("Page " + i.ToString(), action.Action + "Page", urlParams)</li>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
<li>
|
||||
<a href="#sitemap-@action.UniqueId" data-toggle="collapse">@action.Name</a>
|
||||
<ul id="sitemap-@action.UniqueId" class="collapse">
|
||||
<li>@Html.ActionLink("Page 1", action.Action, action.UrlParams)</li>
|
||||
@for (int i = 2; i <= action.Pages; i++)
|
||||
{
|
||||
var urlParams = action.UrlParams;
|
||||
urlParams["page"] = i;
|
||||
<li>@Html.ActionLink("Page " + i.ToString(), action.Action + "Page", urlParams)</li>
|
||||
}
|
||||
</ul>
|
||||
</li>
|
||||
}
|
||||
}
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
}
|
||||
<li>
|
||||
<a href="#sitemap-rss" data-toggle="collapse">@BuildFeed.Local.Common.RssFeeds</a>
|
||||
<ul id="sitemap-rss" class="collapse">
|
||||
<li><a href="@Url.Action("index", new { controller = "rss" })" title="@BuildFeed.Local.Support.RecentlyCompiled"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.RecentlyCompiled</a></li>
|
||||
<li><a href="@Url.Action("leaked", new { controller = "rss" })" title="@BuildFeed.Local.Support.RecentlyLeaked"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.RecentlyLeaked</a></li>
|
||||
<li><a href="@Url.Action("added", new { controller = "rss" })" title="@BuildFeed.Local.Support.RecentlyAdded"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.RecentlyAdded</a></li>
|
||||
<li><a href="@Url.Action("version", new { controller = "rss" })" title="@BuildFeed.Local.Support.HighestVersion"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Support.HighestVersion</a></li>
|
||||
<li>
|
||||
@BuildFeed.Local.Model.FlightLevel
|
||||
<ul>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "wis" })" title="@BuildFeed.Local.Model.FlightWIS"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightWIS</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "wif" })" title="@BuildFeed.Local.Model.FlightWIF"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightWIF</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "osg" })" title="@BuildFeed.Local.Model.FlightOSG"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightOSG</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "msit" })" title="@BuildFeed.Local.Model.FlightMSIT"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightMSIT</a></li>
|
||||
<li><a href="@Url.Action("flight", new { controller = "rss", id = "canary" })" title="@BuildFeed.Local.Model.FlightCanary"><i class="fa fa-sm fa-rss"></i> @BuildFeed.Local.Model.FlightCanary</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#rss-labs" data-toggle="collapse">@BuildFeed.Local.Model.Lab</a>
|
||||
<ul id="rss-labs" class="collapse">
|
||||
@foreach (string lab in Model.Labs)
|
||||
{
|
||||
<li><a href="@Url.Action("lab", new { controller = "rss", lab = lab })" title="@lab"><i class="fa fa-sm fa-rss"></i> @lab</a></li>
|
||||
}
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user