Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed conflicting JavaScript additions, that broke Series Details.

This commit is contained in:
markus101 2011-02-15 22:23:28 -08:00
parent 735668f7b3
commit d83ae9895c
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
NzbDrone.Web/Controllers/SeriesController.cs
View File

@ -35,7 +35,6 @@ namespace NzbDrone.Web.Controllers
return View();
}
public ActionResult Sync()
{
_syncProvider.BeginSyncUnmappedFolders();
@ -48,13 +47,11 @@ namespace NzbDrone.Web.Controllers
return RedirectToAction("Index");
}
public ActionResult UnMapped()
{
return View(_seriesProvider.GetUnmappedFolders().Select(c => new MappingModel() { Id = 1, Path = c.Value }).ToList());
}
public ActionResult LoadEpisodes(int seriesId)
{
_episodeProvider.RefreshEpisodeInfo(seriesId);
@ -64,7 +61,6 @@ namespace NzbDrone.Web.Controllers
});
}
[GridAction]
public ActionResult _AjaxSeasonGrid(int seasonId)
{
@ -80,8 +76,6 @@ namespace NzbDrone.Web.Controllers
return View(new GridModel(episodes));
}
[GridAction]
public ActionResult _CustomBinding(GridCommand command, int seasonId)
{
@ -163,12 +157,9 @@ namespace NzbDrone.Web.Controllers
return RedirectToAction("UnMapped");
}
public ActionResult Details(int seriesId)
{
return View(_seriesProvider.GetSeries(seriesId));
}
}
}

4
NzbDrone.Web/Views/Series/Details.aspx
View File

@ -53,9 +53,9 @@
columns.Bound(c => c.Title).Title("Title");
columns.Bound(c => c.AirDate).Format("{0:d}").Width(0);
})
//.DetailView(detailView => detailView.Template(e => Html.RenderPartial("EpisodeDetail", e)))
//.DetailView(detailView => detailView.Template(e => Html.RenderPartial("EpisodeDetail", e)))
.DetailView(detailView => detailView.ClientTemplate("<div><#= Overview #></div>"))
.Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber).Ascending()).Enabled(false))
.Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber)).Enabled(false))
.Footer(false)
.DataBinding(d => d.Ajax().Select("_AjaxSeasonGrid", "Series", new RouteValueDictionary { { "seasonId", season1.SeasonId.ToString() } }))
//.EnableCustomBinding(true)

4
NzbDrone.Web/Views/Shared/Site.Master
View File

@ -52,13 +52,11 @@
</body>
<asp:ContentPlaceHolder runat="server" id="Scripts" />
<% Html.Telerik().ScriptRegistrar().Scripts(
c => c.Add("jquery-1.4.3.min.js")
.Add("jquery-ui-1.8.8.min.js")
c => c.Add("jquery-ui-1.8.8.min.js")
.Add("jquery.form.js")
.Add("jquery.jgrowl.js")
.Add("Notification.js")
.Add("jquery-tgc-countdown-1.0.js")
.Add("jquery.simpledropdown.js")
.Add("MicrosoftAjax.js")
.Add("MicrosoftMvcValidation.js"))
.Render();