From b0c2807b568ad6101b89bb8cb3e9412ce6451921 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 6 Feb 2012 22:47:02 -0800 Subject: [PATCH] Fixed grid ajax links. --- NzbDrone.Web/Scripts/NzbDrone/grid.js | 3 +++ NzbDrone.Web/Views/Series/Details.cshtml | 3 ++- NzbDrone.Web/Views/Series/Episode.cshtml | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/NzbDrone.Web/Scripts/NzbDrone/grid.js b/NzbDrone.Web/Scripts/NzbDrone/grid.js index f35b200ba..ff4857619 100644 --- a/NzbDrone.Web/Scripts/NzbDrone/grid.js +++ b/NzbDrone.Web/Scripts/NzbDrone/grid.js @@ -1,5 +1,8 @@ /* Click on row, show details */ $('.seriesTable a').live('click', function (event) { + if ($(this).attr('onclick')) + return; + event.preventDefault(); var link = $(this).attr('href'); window.location = link; diff --git a/NzbDrone.Web/Views/Series/Details.cshtml b/NzbDrone.Web/Views/Series/Details.cshtml index d052e4c43..052d9f0cd 100644 --- a/NzbDrone.Web/Views/Series/Details.cshtml +++ b/NzbDrone.Web/Views/Series/Details.cshtml @@ -1,7 +1,8 @@ @model SeriesDetailsModel + @using NzbDrone.Web.Helpers @using NzbDrone.Web.Models -@{ViewBag.Title = Model.Title;} + @section HeaderContent { @Html.IncludeCss("Grid.css") diff --git a/NzbDrone.Web/Views/Series/Episode.cshtml b/NzbDrone.Web/Views/Series/Episode.cshtml index d068b05cd..f9a85202e 100644 --- a/NzbDrone.Web/Views/Series/Episode.cshtml +++ b/NzbDrone.Web/Views/Series/Episode.cshtml @@ -1,3 +1,4 @@ + @using NzbDrone.Web.Helpers @model NzbDrone.Web.Models.EpisodeModel @@ -25,8 +26,8 @@ @Model.Status - @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for episode", @class = "searchImage" }, "Search", "Episode", new { EpisodeId = Model.EpisodeId }, null, null) - @Ajax.ImageActionLink("../../Content/Images/Rename.png", new { Alt = "Rename", Title = "Rename episode", @class = "renameImage" }, "Rename", "Episode", new { EpisodeFileId = Model.EpisodeFileId }, null, null) + @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for episode", @class = "searchImage" }, "Search", "Episode", new { episodeId = Model.EpisodeId }, null, null) + @Ajax.ImageActionLink("../../Content/Images/Rename.png", new { Alt = "Rename", Title = "Rename episode", @class = "renameImage" }, "Rename", "Episode", new { episodeFileId = Model.EpisodeFileId }, null, null)