diff --git a/static/ng/resources/js/components/project-member/add-project-member.directive.js b/static/ng/resources/js/components/project-member/add-project-member.directive.js index 9e4446110..04f6cf267 100644 --- a/static/ng/resources/js/components/project-member/add-project-member.directive.js +++ b/static/ng/resources/js/components/project-member/add-project-member.directive.js @@ -31,9 +31,6 @@ AddProjectMemberService(vm.projectId, vm.optRole, pm.username) .success(addProjectMemberComplete) .error(addProjectMemberFailed); - vm.username = ''; - vm.optRole = 1; - vm.reload(); } } @@ -48,6 +45,7 @@ function addProjectMemberComplete(data, status, header) { console.log('addProjectMemberComplete: status:' + status + ', data:' + data); + vm.reload(); } function addProjectMemberFailed(data, status, headers) { diff --git a/static/ng/resources/js/components/project-member/edit-project-member.directive.js b/static/ng/resources/js/components/project-member/edit-project-member.directive.js index fc1a1626d..fa31c8354 100644 --- a/static/ng/resources/js/components/project-member/edit-project-member.directive.js +++ b/static/ng/resources/js/components/project-member/edit-project-member.directive.js @@ -28,7 +28,6 @@ function updateProjectMember(e) { if(vm.editMode) { - vm.editMode = false; console.log('update project member, roleId:' + e.roleId); EditProjectMemberService(e.projectId, e.userId, e.roleId) .success(editProjectMemberComplete) @@ -42,12 +41,13 @@ DeleteProjectMemberService(e.projectId, e.userId) .success(editProjectMemberComplete) .error(editProjectMemberFailed); - vm.reload(); } function editProjectMemberComplete(data, status, headers) { console.log('edit project member complete: ' + status); vm.lastRoleName = vm.roleName; + vm.editMode = false; + vm.reload(); } function editProjectMemberFailed(e) { @@ -56,7 +56,6 @@ function cancelUpdate() { vm.editMode = false; - console.log('lastRoleName:' + vm.lastRoleName); vm.roleName = vm.lastRoleName; } diff --git a/static/ng/resources/js/components/project-member/switch-role.directive.js b/static/ng/resources/js/components/project-member/switch-role.directive.js index ddab6abb0..0953820e6 100644 --- a/static/ng/resources/js/components/project-member/switch-role.directive.js +++ b/static/ng/resources/js/components/project-member/switch-role.directive.js @@ -16,6 +16,7 @@ vm.currentRole = getRole({'key': 'roleName', 'value': current}); } }); + vm.selectRole = selectRole; function selectRole(role) { diff --git a/static/ng/resources/js/layout/navigation/navigation-details.directive.js b/static/ng/resources/js/layout/navigation/navigation-details.directive.js index 24dea5ee8..a60bad5d0 100644 --- a/static/ng/resources/js/layout/navigation/navigation-details.directive.js +++ b/static/ng/resources/js/layout/navigation/navigation-details.directive.js @@ -38,22 +38,23 @@ function link(scope, element, attrs, ctrl) { - var visited = ctrl.url.substring(1); - + var visited = ctrl.url.substring(1); if(visited.indexOf('?') >= 0) { - visited = ctrl.url.substring(1, ctrl.url.indexOf('?') - 1); + visited = ctrl.url.substring(1, ctrl.url.indexOf('?')); } - scope.$watch('vm.selectedProject', function(current) { if(current) { element.find('a').removeClass('active'); - element.find('a:first').addClass('active'); + if(visited) { + element.find('a[tag="' + visited + '"]').addClass('active'); + }else{ + element.find('a:first').addClass('active'); + } } }); - - element.find('a[tag*="' + visited + '"]').addClass('active'); - element.find('a').on('click', click); + element.find('a').on('click', click); + function click(event) { element.find('a').removeClass('active'); $(event.target).addClass('active');