diff --git a/static/resources/js/components/details/retrieve-projects.directive.js b/static/resources/js/components/details/retrieve-projects.directive.js index 41b57ec795..c740e154cb 100644 --- a/static/resources/js/components/details/retrieve-projects.directive.js +++ b/static/resources/js/components/details/retrieve-projects.directive.js @@ -31,14 +31,20 @@ vm.target = $location.path().substr(1) || 'repositories'; vm.isPublic = Number(getParameterByName('is_public', $location.absUrl())); + + var DEFAULT_PAGE = 1; + var DEFAULT_PAGE_SIZE = 15; + vm.page = Number(getParameterByName('page', $location.absUrl()) || DEFAULT_PAGE); + vm.pageSize = Number(getParameterByName('page_size', $location.absUrl()) || DEFAULT_PAGE_SIZE); + vm.retrieve = retrieve; vm.filterInput = ''; vm.selectItem = selectItem; vm.checkProjectMember = checkProjectMember; function retrieve() { - ListProjectService(vm.projectName, vm.isPublic) + ListProjectService(vm.projectName, vm.isPublic, vm.page, vm.pageSize) .success(getProjectSuccess) .error(getProjectFailed); } @@ -58,7 +64,6 @@ function getProjectSuccess(data, status) { vm.projects = data || []; - if(vm.projects.length == 0 && vm.isPublic === 0){ $window.location.href = '/project'; } diff --git a/static/resources/js/components/loading-progress/loading-progress.directive.js b/static/resources/js/components/loading-progress/loading-progress.directive.js index 030f19edfa..073d3dceb3 100644 --- a/static/resources/js/components/loading-progress/loading-progress.directive.js +++ b/static/resources/js/components/loading-progress/loading-progress.directive.js @@ -41,8 +41,6 @@ var hideTarget = convertToBoolean(scope.hideTarget); - console.log('loading-progress, toggleInProgress:' + scope.toggleInProgress + ', hideTarget:' + hideTarget); - var pristine = element.html(); scope.$watch('toggleInProgress', function(current) { diff --git a/static/resources/js/components/repository/list-repository.directive.js b/static/resources/js/components/repository/list-repository.directive.js index 655ac67649..7154c0ae3c 100644 --- a/static/resources/js/components/repository/list-repository.directive.js +++ b/static/resources/js/components/repository/list-repository.directive.js @@ -154,7 +154,7 @@ function deleteRepositorySuccess(data, status) { vm.toggleInProgress[vm.repoName + '|' + vm.tag] = false; - vm.retrieve(); + $scope.$broadcast('refreshTags', true); } function deleteRepositoryFailed(data, status) { diff --git a/static/resources/js/session/session.current-user.js b/static/resources/js/session/session.current-user.js index 9e51af4cdb..b5e0018f06 100644 --- a/static/resources/js/session/session.current-user.js +++ b/static/resources/js/session/session.current-user.js @@ -32,7 +32,14 @@ function getCurrentUserComplete(response) { if(angular.isDefined(response)) { - currentUser.set(response.data); + var user = response.data; + currentUser.set({ + 'user_id': user.user_id, + 'username': user.username, + 'role_name': user.role_name, + 'email': user.email, + 'realname': user.realname, + 'comment': user.comment}); if(location.pathname === '/') { $window.location.href = '/dashboard'; } diff --git a/views/project.htm b/views/project.htm index f56c5b0fd9..15ad745b65 100644 --- a/views/project.htm +++ b/views/project.htm @@ -59,7 +59,7 @@

// 'no_projects_add_new_project' | tr //

- //p.name// + //p.name// //p.repo_count// //vm.getProjectRole(p.current_user_role_id) | tr// //p.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'//