[GitHub] dangogh closed pull request #2022: [Issue 1823] - updates server port defaults and some ui bugs

[GitBox <gi...@apache.org>]

dangogh closed pull request #2022: [Issue 1823] - updates server port defaults and some ui bugs
URL: https://github.com/apache/incubator-trafficcontrol/pull/2022
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/traffic_portal/app/src/common/api/ServerService.js b/traffic_portal/app/src/common/api/ServerService.js
index 9b20f1693..03c44d0d9 100644
--- a/traffic_portal/app/src/common/api/ServerService.js
+++ b/traffic_portal/app/src/common/api/ServerService.js
@@ -30,9 +30,9 @@ var ServerService = function($http, $q, Restangular, locationUtils, messageModel
     this.createServer = function(server) {
         return Restangular.service('servers').post(server)
             .then(
-                function(response) {
+                function() {
                     messageModel.setMessages([ { level: 'success', text: 'Server created' } ], true);
-                    locationUtils.navigateToPath('/servers/' + response.id);
+                    locationUtils.navigateToPath('/servers');
                 },
                 function(fault) {
                     messageModel.setMessages(fault.data.alerts, false);
diff --git a/traffic_portal/app/src/common/modules/form/server/FormServerController.js b/traffic_portal/app/src/common/modules/form/server/FormServerController.js
index b170bcb0f..42381ea0b 100644
--- a/traffic_portal/app/src/common/modules/form/server/FormServerController.js
+++ b/traffic_portal/app/src/common/modules/form/server/FormServerController.js
@@ -61,7 +61,7 @@ var FormServerController = function(server, $scope, $location, $state, $uibModal
             .then(
                 function(result) {
                     messageModel.setMessages(result.data.alerts, false);
-                    refresh();
+                    $scope.refresh();
                 },
 	            function(fault) {
 		            messageModel.setMessages(fault.data.alerts, false);
@@ -69,7 +69,7 @@ var FormServerController = function(server, $scope, $location, $state, $uibModal
             );
     };
     
-    var refresh = function() {
+    $scope.refresh = function() {
         $state.reload(); // reloads all the resolves for the view
     };
 
@@ -100,7 +100,7 @@ var FormServerController = function(server, $scope, $location, $state, $uibModal
         serverService.queueServerUpdates(server.id)
             .then(
                 function() {
-                    refresh();
+                    $scope.refresh();
                 }
             );
     };
@@ -109,7 +109,7 @@ var FormServerController = function(server, $scope, $location, $state, $uibModal
         serverService.clearServerUpdates(server.id)
             .then(
                 function() {
-                    refresh();
+                    $scope.refresh();
                 }
             );
     };
diff --git a/traffic_portal/app/src/common/modules/form/server/edit/FormEditServerController.js b/traffic_portal/app/src/common/modules/form/server/edit/FormEditServerController.js
index a24f39f29..2f8bb5146 100644
--- a/traffic_portal/app/src/common/modules/form/server/edit/FormEditServerController.js
+++ b/traffic_portal/app/src/common/modules/form/server/edit/FormEditServerController.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-var FormEditServerController = function(server, $scope, $controller, $uibModal, $anchorScroll, locationUtils, serverService, statusService) {
+var FormEditServerController = function(server, $scope, $controller, $uibModal, locationUtils, serverService, statusService) {
 
     // extends the FormServerController to inherit common methods
     angular.extend(this, $controller('FormServerController', { server: server, $scope: $scope }));
@@ -46,8 +46,7 @@ var FormEditServerController = function(server, $scope, $controller, $uibModal,
     $scope.save = function(server) {
         serverService.updateServer(server).
             then(function() {
-                $scope.serverName = angular.copy(server.hostName);
-                $anchorScroll(); // scrolls window to top
+                $scope.refresh();
             });
     };
 
@@ -80,5 +79,5 @@ var FormEditServerController = function(server, $scope, $controller, $uibModal,
 
 };
 
-FormEditServerController.$inject = ['server', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'serverService', 'statusService'];
+FormEditServerController.$inject = ['server', '$scope', '$controller', '$uibModal', 'locationUtils', 'serverService', 'statusService'];
 module.exports = FormEditServerController;
diff --git a/traffic_portal/app/src/modules/private/servers/new/index.js b/traffic_portal/app/src/modules/private/servers/new/index.js
index c56ceb5d7..4a88bbb42 100644
--- a/traffic_portal/app/src/modules/private/servers/new/index.js
+++ b/traffic_portal/app/src/modules/private/servers/new/index.js
@@ -29,7 +29,9 @@ module.exports = angular.module('trafficPortal.private.servers.new', [])
                         resolve: {
                             server: function() {
                                 return {
-                                    updPending: false
+                                    updPending: false,
+                                    tcpPort: 80,
+                                    httpsPort: 443
                                 };
                             }
                         }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services