diff options
author | thuva4 <tharma.thuva@gmail.com> | 2017-12-07 09:47:08 +0530 |
---|---|---|
committer | thuva4 <tharma.thuva@gmail.com> | 2017-12-15 18:23:34 +0530 |
commit | 4e98903ccae3363090de8fefb463b64a943b8f9f (patch) | |
tree | 202e1bbcf59fb13d57f6ef390644188fdfc23a2e /testapi/opnfv_testapi/ui/components/projects/project/projectController.js | |
parent | 41ff15069d96ea1040cb457b39f909967dabb8bc (diff) |
Redesign the projects page & project page
redesign the projects page like pods page
included the delete, filter, create, edit,
batch delete in the projects page.
Unify the update modal for projects page and
project page.
Fix authenticate - fault opertaions
Change-Id: If4ea50ada11941c5d9199d898476837020c02241
Signed-off-by: thuva4 <tharma.thuva@gmail.com>
Diffstat (limited to 'testapi/opnfv_testapi/ui/components/projects/project/projectController.js')
-rw-r--r-- | testapi/opnfv_testapi/ui/components/projects/project/projectController.js | 107 |
1 files changed, 27 insertions, 80 deletions
diff --git a/testapi/opnfv_testapi/ui/components/projects/project/projectController.js b/testapi/opnfv_testapi/ui/components/projects/project/projectController.js index 8f4bd20..e8d7bd6 100644 --- a/testapi/opnfv_testapi/ui/components/projects/project/projectController.js +++ b/testapi/opnfv_testapi/ui/components/projects/project/projectController.js @@ -41,34 +41,29 @@ ctrl.openUpdateModal = openUpdateModal; ctrl.updateProject = updateProject; - /** * This will contact the TestAPI to update an existing project. */ - function updateProject(name,description) { + function updateProject(name,project) { ctrl.showError = false; ctrl.showSuccess = false; - if(ctrl.name != ""){ - var projects_url = ctrl.url; - var body = { - name: name, - description: description - }; - ctrl.projectsRequest = - $http.put(projects_url, body).success(function (data){ - ctrl.showSuccess = true ; - }) - .error(function (data) { - ctrl.showError = true; - ctrl.error = 'Error updating the existing Project from server: ' + angular.toJson(data); - }); - ctrl.name = ""; - ctrl.description=""; - } - else{ - ctrl.showError = true; - ctrl.error = 'Name is missing.' - } + var projects_url = ctrl.url; + var body = { + name: project.name, + description: project.description + }; + ctrl.projectsRequest = + $http.put(projects_url, body).success(function (data){ + ctrl.showSuccess = true ; + ctrl.name = body.name; + $state.go('project', {'name':ctrl.name}, {reload: true}); + }) + .catch(function (error) { + ctrl.showError = true; + ctrl.error = error.statusText + }); + + } /** @@ -79,14 +74,11 @@ ctrl.showSuccess = false; ctrl.projectsRequest = $http.delete(ctrl.url).success(function (data) { - $state.go('projects', {}, {reload: true}); + $state.go('projects', {'name':ctrl.name}, {reload: true}); ctrl.showSuccess = true ; - - }).error(function (error) { + }).catch(function (error) { ctrl.showError = true; - ctrl.error = - 'Error deleting project from server: ' + - angular.toJson(error); + ctrl.error = error.statusText }); } @@ -104,15 +96,15 @@ */ function openUpdateModal(){ $uibModal.open({ - templateUrl: 'testapi-ui/components/projects/project/updateModal.html', - controller: 'ModalInstanceCtrl as updateModal', + templateUrl: 'testapi-ui/components/projects/modals/projectModal.html', + controller: 'ProjectModalCtrl as ProjectModalCtrl', size: 'md', resolve: { data: function () { return { - text: "Update", + text: "Update Project", successHandler: ctrl.updateProject, - project: ctrl.data + project : ctrl.data }; } } @@ -127,57 +119,12 @@ ctrl.projectsRequest = $http.get(ctrl.url).success(function (data) { ctrl.data = data; - }).error(function (error) { + }).catch(function (error) { ctrl.data = null; ctrl.showError = true; - ctrl.error = - 'Error retrieving projects from server: ' + - angular.toJson(error); + ctrl.error = error.statusText }); } ctrl.loadDetails(); } - - - /** - * TestAPI Modal instance Controller - * This controller is for the update modal where a user can update - * the project information. - */ - angular.module('testapiApp').controller('ModalInstanceCtrl', ModalInstanceCtrl); - ModalInstanceCtrl.$inject = ['$scope', '$uibModalInstance', 'data']; - function ModalInstanceCtrl($scope, $uibModalInstance, data) { - var ctrl = this; - ctrl.confirm = confirm; - ctrl.cancel = cancel; - ctrl.data = angular.copy(data); - - ctrl.createRequirements = [ - {label: 'name', type: 'text', required: true}, - {label: 'description', type: 'textarea', required: false} - ]; - - ctrl.name = ctrl.data.project.name; - ctrl.description = ctrl.data.project.description; - - /** - * Initiate confirmation and call the success handler with the - * inputs. - */ - function confirm() { - $uibModalInstance.close(); - if (angular.isDefined(ctrl.data.successHandler)) { - ctrl.data.successHandler(ctrl.name,ctrl.description); - } - } - - /** - * Close the confirm modal without initiating changes. - */ - function cancel() { - $uibModalInstance.dismiss('cancel'); - } - } - - })(); |