Selaa lähdekoodia

HUE-1963 [sqoop] minor bug fixes

- It turns out that the window.location.back function seems to be somewhat async.
  Wait for hashchange to update connection.
- Add check for connection when cancelling.
Abraham Elmahrek 11 vuotta sitten
vanhempi
commit
00b1453
2 muutettua tiedostoa jossa 5 lisäystä ja 4 poistoa
  1. 5 3
      apps/sqoop/src/sqoop/templates/app.mako
  2. 0 1
      apps/sqoop/static/js/sqoop.jobs.js

+ 5 - 3
apps/sqoop/src/sqoop/templates/app.mako

@@ -1210,16 +1210,18 @@ $(document).ready(function () {
       });
     },
     "connection/edit-cancel": function() {
-      if (!viewModel.connection().persisted()) {
+      if (viewModel.connection() && !viewModel.connection().persisted()) {
         viewModel.connections.pop();
       }
       // routie('job/edit');
       window.history.go(-2);
     },
     "connection/new": function() {
-      viewModel.newConnection();
+      $(window).one('hashchange', function() {
+        viewModel.newConnection();
+        routie('connection/edit');
+      });
       window.history.back();
-      routie('connection/edit');
     },
     "connection/save": function() {
       viewModel.saveConnection();

+ 0 - 1
apps/sqoop/static/js/sqoop.jobs.js

@@ -158,7 +158,6 @@ var jobs = (function($) {
         var table = null;
         $.each(self.connector(), function(index, form) {
           if (form.name() == 'table') {
-            console.log(form.name());
             $.each(form.inputs(), function(index, input) {
               if (input.name() == 'table.tableName') {
                 table = input.value();