diff --git a/src/NzbDrone.Core/NetImport/NetImportSearchService.cs b/src/NzbDrone.Core/NetImport/NetImportSearchService.cs index b616b293e..0bfe92b67 100644 --- a/src/NzbDrone.Core/NetImport/NetImportSearchService.cs +++ b/src/NzbDrone.Core/NetImport/NetImportSearchService.cs @@ -25,13 +25,11 @@ public class NetImportSearchService : IFetchNetImport, IExecute self.options.maxInputLength) + return; + */ + // raise beforeItemAdd arg + var beforeItemAddEvent = $.Event('beforeItemAdd', { item: item, cancel: false }); + self.$element.trigger(beforeItemAddEvent); + if (beforeItemAddEvent.cancel) + return; + + // register item in internal array and map + //self.itemsArray.push(item); + + // read var beforeItemAddEvent with new value + var item = beforeItemAddEvent.item; // Get text from event (BeforeItemAddEvent) var itemValue = self.options.itemValue(item), itemText = self.options.itemText(item), tagClass = self.options.tagClass(item); @@ -114,14 +145,22 @@ if (self.items().toString().length + item.length + 1 > self.options.maxInputLength) return; - // raise beforeItemAdd arg - var beforeItemAddEvent = $.Event('beforeItemAdd', { item: item, cancel: false }); - self.$element.trigger(beforeItemAddEvent); - if (beforeItemAddEvent.cancel) - return; - // register item in internal array and map + // register item in internal array and map self.itemsArray.push(item); + + if (beforeItemAddEvent.tagClass !== undefined){ var tagClass = beforeItemAddEvent.tagClass; } + if (item != undefined){ + var items = item.toString().split(','); + if (items.length > 1) { + for (var i = 0; i < items.length; i++) { + this.add(items[i], true); + } + if (!dontPushVal) + self.pushVal(self.options.triggerChange); + return; + } + } // add a tag element var $tag = $('' + htmlEncode(itemText) + ''); diff --git a/src/UI/Settings/NetImport/Options/NetImportOptionsView.js b/src/UI/Settings/NetImport/Options/NetImportOptionsView.js index 13c5fc8e9..9b28af115 100644 --- a/src/UI/Settings/NetImport/Options/NetImportOptionsView.js +++ b/src/UI/Settings/NetImport/Options/NetImportOptionsView.js @@ -90,12 +90,19 @@ var view = Marionette.ItemView.extend({ }); promise.success(function(response) { event.cancel=false; + + //var newText = response['tmdbId']+'-'; + //if (event.item.startsWith('tt')) { + // newText = newText+'['+event.item+']'; + //} + event.item = response['titleSlug'];//+' ('+response['year']+')-'+response['tmdbId']; }); promise.error(function(request, status, error) { event.cancel = true; window.alert(event.item+' is not a valid! Must be valid tt#### IMDB ID or #### TMDB ID'); - }); + }); + return event; }); }, diff --git a/src/UI/Settings/NetImport/Options/NetImportOptionsViewTemplate.hbs b/src/UI/Settings/NetImport/Options/NetImportOptionsViewTemplate.hbs index 1cfc5b6dc..bd429de47 100644 --- a/src/UI/Settings/NetImport/Options/NetImportOptionsViewTemplate.hbs +++ b/src/UI/Settings/NetImport/Options/NetImportOptionsViewTemplate.hbs @@ -32,11 +32,11 @@
-
+
-
+