Fix merge conflict introduced in when merging master->ux-release-1

Bug was introduced in merge commit
cb6fe50832 and resulted in import
into inventories not working.

app/assets/javascripts/repositories/index.js

@@ -7,7 +7,98 @@
     location.reload();
   }
 
+  function initImportRecordsModal() {
+    $('#importRecordsButton').off().on('click', function() {
+      $('#modal-import-records').modal('show');
+      _initParseRecordsModal();
+    });
+  }
+
+  function _initParseRecordsModal() {
+    var form = $('#form-records-file');
+    var submitBtn = form.find('input[type="submit"]');
+    submitBtn.on('click', function(event) {
+      event.preventDefault();
+      event.stopPropagation();
+      var data = new FormData();
+      data.append('file', document.getElementById('file').files[0]);
+      data.append('team_id', document.getElementById('team_id').value);
+      $.ajax({
+        type: 'POST',
+        url: form.attr('action'),
+        data: data,
+        success: _handleSuccessfulSubmit,
+        error: _handleErrorSubmit,
+        processData: false,
+        contentType: false,
+      });
+    });
+  }
+
+  function _handleErrorSubmit(XHR) {
+    var formGroup = $('#form-records-file').find('.form-group');
+    formGroup.addClass('has-error');
+    formGroup.find('.help-block').remove();
+    formGroup.append('<span class="help-block">' +
+                     XHR.responseJSON.message + '</span>');
+  }
+
+  function _handleSuccessfulSubmit(data) {
+    $('#modal-import-records').modal('hide');
+    $(data.html).appendTo('body').promise().done(function() {
+      $('#parse-records-modal')
+        .modal('show')
+        .on('hidden.bs.modal', function() {
+          animateSpinner();
+          location.reload();
+        });
+      repositoryRecordsImporter();
+    });
+  }
+
+  function loadRepositoryTab() {
+    var param;
+    $('#repository-tabs a').on("click", function(e) {
+      e.preventDefault();
+      var pane = $(this);
+      $.ajax({
+        url: $(this).attr("data-url"),
+        type: "GET",
+        dataType: "json",
+        success: function (data) {
+          var tabBody = $(pane.context.hash).find(".tab-content-body");
+          tabBody.html(data.html);
+          pane.tab('show').promise().done(function(el) {
+            initImportRecordsModal();
+            RepositoryDatatable.destroy()
+            RepositoryDatatable.init(el.attr('data-repo-table'));
+          });
+        },
+        error: function (error) {
+          // TODO
+        }
+      });
+    });
+
+    // on page load
+    if( param = getParam('repository') ){
+      // load selected tab
+      $('a[href="#custom_repo_'+param+'"]').click();
+    }
+    else {
+      // load first tab content
+      $('#repository-tabs a:first').click();
+    }
+
+    // clean tab content
+    $('a[data-toggle="tab"]').on('hide.bs.tab', function (e) {
+      $(".tab-content-body").html("");
+    })
+  }
+
   $(document).ready(function() {
     $('#create-new-repository').initializeModal('#create-repo-modal');
+    loadRepositoryTab();
+    initImportRecordsModal();
   });
 })(window);