mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 12:02:35 +02:00
Removed conflicting JavaScript additions, that broke Series Details.
This commit is contained in:
parent
735668f7b3
commit
d83ae9895c
@ -35,7 +35,6 @@ public ActionResult Index()
|
|||||||
return View();
|
return View();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public ActionResult Sync()
|
public ActionResult Sync()
|
||||||
{
|
{
|
||||||
_syncProvider.BeginSyncUnmappedFolders();
|
_syncProvider.BeginSyncUnmappedFolders();
|
||||||
@ -48,13 +47,11 @@ public ActionResult RssSync()
|
|||||||
return RedirectToAction("Index");
|
return RedirectToAction("Index");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public ActionResult UnMapped()
|
public ActionResult UnMapped()
|
||||||
{
|
{
|
||||||
return View(_seriesProvider.GetUnmappedFolders().Select(c => new MappingModel() { Id = 1, Path = c.Value }).ToList());
|
return View(_seriesProvider.GetUnmappedFolders().Select(c => new MappingModel() { Id = 1, Path = c.Value }).ToList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public ActionResult LoadEpisodes(int seriesId)
|
public ActionResult LoadEpisodes(int seriesId)
|
||||||
{
|
{
|
||||||
_episodeProvider.RefreshEpisodeInfo(seriesId);
|
_episodeProvider.RefreshEpisodeInfo(seriesId);
|
||||||
@ -64,7 +61,6 @@ public ActionResult LoadEpisodes(int seriesId)
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
[GridAction]
|
[GridAction]
|
||||||
public ActionResult _AjaxSeasonGrid(int seasonId)
|
public ActionResult _AjaxSeasonGrid(int seasonId)
|
||||||
{
|
{
|
||||||
@ -80,8 +76,6 @@ public ActionResult _AjaxSeasonGrid(int seasonId)
|
|||||||
return View(new GridModel(episodes));
|
return View(new GridModel(episodes));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[GridAction]
|
[GridAction]
|
||||||
public ActionResult _CustomBinding(GridCommand command, int seasonId)
|
public ActionResult _CustomBinding(GridCommand command, int seasonId)
|
||||||
{
|
{
|
||||||
@ -163,12 +157,9 @@ public ActionResult _SaveAjaxEditing(string id)
|
|||||||
return RedirectToAction("UnMapped");
|
return RedirectToAction("UnMapped");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public ActionResult Details(int seriesId)
|
public ActionResult Details(int seriesId)
|
||||||
{
|
{
|
||||||
return View(_seriesProvider.GetSeries(seriesId));
|
return View(_seriesProvider.GetSeries(seriesId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -53,9 +53,9 @@
|
|||||||
columns.Bound(c => c.Title).Title("Title");
|
columns.Bound(c => c.Title).Title("Title");
|
||||||
columns.Bound(c => c.AirDate).Format("{0:d}").Width(0);
|
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>"))
|
.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)
|
.Footer(false)
|
||||||
.DataBinding(d => d.Ajax().Select("_AjaxSeasonGrid", "Series", new RouteValueDictionary { { "seasonId", season1.SeasonId.ToString() } }))
|
.DataBinding(d => d.Ajax().Select("_AjaxSeasonGrid", "Series", new RouteValueDictionary { { "seasonId", season1.SeasonId.ToString() } }))
|
||||||
//.EnableCustomBinding(true)
|
//.EnableCustomBinding(true)
|
||||||
|
@ -52,13 +52,11 @@
|
|||||||
</body>
|
</body>
|
||||||
<asp:ContentPlaceHolder runat="server" id="Scripts" />
|
<asp:ContentPlaceHolder runat="server" id="Scripts" />
|
||||||
<% Html.Telerik().ScriptRegistrar().Scripts(
|
<% Html.Telerik().ScriptRegistrar().Scripts(
|
||||||
c => c.Add("jquery-1.4.3.min.js")
|
c => c.Add("jquery-ui-1.8.8.min.js")
|
||||||
.Add("jquery-ui-1.8.8.min.js")
|
|
||||||
.Add("jquery.form.js")
|
.Add("jquery.form.js")
|
||||||
.Add("jquery.jgrowl.js")
|
.Add("jquery.jgrowl.js")
|
||||||
.Add("Notification.js")
|
.Add("Notification.js")
|
||||||
.Add("jquery-tgc-countdown-1.0.js")
|
.Add("jquery-tgc-countdown-1.0.js")
|
||||||
.Add("jquery.simpledropdown.js")
|
|
||||||
.Add("MicrosoftAjax.js")
|
.Add("MicrosoftAjax.js")
|
||||||
.Add("MicrosoftMvcValidation.js"))
|
.Add("MicrosoftMvcValidation.js"))
|
||||||
.Render();
|
.Render();
|
||||||
|
Loading…
Reference in New Issue
Block a user