From dfab2d94018f53ca73549d7fdbb875b4000abe2f Mon Sep 17 00:00:00 2001 From: nichunen Date: Mon, 16 Nov 2015 10:33:25 +0800 Subject: [PATCH] Fix KYLIN-1148. --- webapp/app/js/controllers/page.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js index 7453d48..8382032 100644 --- a/webapp/app/js/controllers/page.js +++ b/webapp/app/js/controllers/page.js @@ -208,7 +208,8 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService, $modal, $lo var projCtrl = function ($scope, $location, $modalInstance, ProjectService, MessageService, projects, project, SweetAlert, ProjectModel, $cookieStore, $route) { $scope.state = { isEdit: false, - oldProjName: null + oldProjName: null, + projectIdx: -1 }; $scope.isEdit = false; $scope.proj = {name: '', description: ''}; @@ -217,6 +218,12 @@ var projCtrl = function ($scope, $location, $modalInstance, ProjectService, Mess $scope.state.isEdit = true; $scope.state.oldProjName = project.name; $scope.proj = project; + for (var i = 0; i < projects.length; i++){ + if (projects[i].name === $scope.state.oldProjName){ + $scope.state.projectIdx = i; + break; + } + } } $scope.createOrUpdate = function () { @@ -268,6 +275,9 @@ var projCtrl = function ($scope, $location, $modalInstance, ProjectService, Mess }; $scope.cancel = function () { + if($scope.state.isEdit){ + projects[$scope.state.projectIdx].name = $scope.state.oldProjName; + } $modalInstance.dismiss('cancel'); }; -- 1.9.5.msysgit.1