Skip to content

moves actions into the caller for more control and scrolls to the top… #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ocket8888 merged 1 commit into from
Jun 23, 2020
Merged

moves actions into the caller for more control and scrolls to the top… #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions traffic_portal/app/src/common/api/ServerService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,9 @@ var ServerService = function($http, locationUtils, messageModel, ENV) {
this.createServer = function(server) {
return $http.post(ENV.api['root'] + 'servers', server).then(
function(result) {
messageModel.setMessages([ { level: 'success', text: 'Server created' } ], true);
locationUtils.navigateToPath('/servers');
return result;
},
function(err) {
messageModel.setMessages(err.data.alerts, false);
throw err;
}
);
Expand All @@ -48,11 +45,9 @@ var ServerService = function($http, locationUtils, messageModel, ENV) {
this.updateServer = function(server) {
return $http.put(ENV.api['root'] + 'servers/' + server.id, server).then(
function(result) {
messageModel.setMessages([ { level: 'success', text: 'Server updated' } ], false);
return result;
},
function(err) {
messageModel.setMessages(err.data.alerts, false);
throw err;
}
);
Expand Down
21 changes: 16 additions & 5 deletions traffic_portal/app/src/common/modules/form/server/edit/FormEditServerController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

var FormEditServerController = function(server, $scope, $controller, $uibModal, locationUtils, serverService, statusService, messageModel) {
var FormEditServerController = function(server, $anchorScroll, $scope, $controller, $uibModal, locationUtils, serverService, statusService, messageModel) {

// extends the FormServerController to inherit common methods
angular.extend(this, $controller('FormServerController', { server: server, $scope: $scope }));
Expand Down Expand Up @@ -46,9 +46,20 @@ var FormEditServerController = function(server, $scope, $controller, $uibModal,

$scope.save = function(server) {
serverService.updateServer(server).
then(function() {
$scope.refresh();
});
then(
function(result) {
$scope.refresh();
messageModel.setMessages(result.data.alerts, false);
},
function(fault) {
messageModel.setMessages(fault.data.alerts, false);
}
)
.finally(
function() {
$anchorScroll(); // scrolls window to top for message
}
);
};

$scope.confirmDelete = function(server) {
Expand Down Expand Up @@ -80,5 +91,5 @@ var FormEditServerController = function(server, $scope, $controller, $uibModal,

};

FormEditServerController.$inject = ['server', '$scope', '$controller', '$uibModal', 'locationUtils', 'serverService', 'statusService', 'messageModel'];
FormEditServerController.$inject = ['server', '$anchorScroll', '$scope', '$controller', '$uibModal', 'locationUtils', 'serverService', 'statusService', 'messageModel'];
module.exports = FormEditServerController;
16 changes: 13 additions & 3 deletions traffic_portal/app/src/common/modules/form/server/new/FormNewServerController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

var FormNewServerController = function(server, $scope, $controller, serverService, statusService) {
var FormNewServerController = function(server, $anchorScroll, $scope, $controller, serverService, statusService, messageModel, locationUtils) {

// extends the FormServerController to inherit common methods
angular.extend(this, $controller('FormServerController', { server: server, $scope: $scope }));
Expand All @@ -40,7 +40,17 @@ var FormNewServerController = function(server, $scope, $controller, serverServic
};

$scope.save = function(server) {
serverService.createServer(server);
serverService.createServer(server).
then(
function(result) {
messageModel.setMessages(result.data.alerts, true);
locationUtils.navigateToPath('/servers');
},
function(fault) {
$anchorScroll(); // scrolls window to top for message
messageModel.setMessages(fault.data.alerts, false);
}
);
};

var init = function () {
Expand All @@ -50,5 +60,5 @@ var FormNewServerController = function(server, $scope, $controller, serverServic

};

FormNewServerController.$inject = ['server', '$scope', '$controller', 'serverService', 'statusService'];
FormNewServerController.$inject = ['server', '$anchorScroll', '$scope', '$controller', 'serverService', 'statusService', 'messageModel', 'locationUtils'];
module.exports = FormNewServerController;