Merge branch 'master' of git://github.com/kayone/NzbDrone

Conflicts:
	NzbDrone.Web/Views/AddSeries/AddSeriesItem.cshtml
This commit is contained in:
Mark McDowall 2011-04-07 17:00:42 -07:00
commit 6e221afe82
66 changed files with 19480 additions and 1705 deletions

View file

@ -125,9 +125,9 @@ namespace NzbDrone.Web.Controllers
public SelectList GetSuggestionList(string searchString)
{
var dataVal = _tvDbProvider.SearchSeries(searchString);
var bestResult = _tvDbProvider.GetBestMatch(dataVal.ToList(), searchString);
//var bestResult = _tvDbProvider.GetBestMatch(dataVal.ToList(), searchString);
return new SelectList(dataVal, "Id", "SeriesName", bestResult);
return new SelectList(dataVal, "Id", "SeriesName", dataVal[0].Id);
}
}