Select input for select series in manual import

src/UI/ManualImport/Series/SelectSeriesLayout.js

@@ -35,6 +35,7 @@ module.exports = Marionette.Layout.extend({
         });
 
         this.listenTo(this.seriesCollection, 'row:selected', this._onSelected);
+        this.listenTo(this, 'modal:afterShow', this._setFocus);
     },
 
     onRender : function() {
@@ -88,5 +89,9 @@ module.exports = Marionette.Layout.extend({
         this.trigger('manualimport:selected:series', { model: e.model });
 
         vent.trigger(vent.Commands.CloseModal2Command);
+    },
+
+    _setFocus : function () {
+        this.ui.filter.focus();
     }
 });

src/UI/Shared/Modal/ModalRegionBase.js

@@ -1,3 +1,4 @@
+var _ = require('underscore');
 var $ = require('jquery');
 var Backbone = require('backbone');
 var Marionette = require('marionette');
@@ -33,7 +34,10 @@ var region = Marionette.Region.extend({
 
         this.currentView.$el.addClass('modal-dialog');
 
-        this.trigger('modal:afterShow');
+        this.$el.on('shown.bs.modal', _.bind(function() {
+            this.trigger('modal:afterShow');
+            this.currentView.trigger('modal:afterShow');
+        }, this));
     },
 
     closeModal : function() {
@@ -44,6 +48,7 @@ var region = Marionette.Region.extend({
     _closing : function() {
         if (this.$el) {
             this.$el.off('hide.bs.modal');
+            this.$el.off('shown.bs.modal');
         }
 
         this.reset();