From 712b1981254899751095f66db2f0e5e3809bd63e Mon Sep 17 00:00:00 2001
From: kunw <kunw@vmware.com>
Date: Mon, 5 Sep 2016 11:34:29 +0800
Subject: [PATCH] Refinement on paginations.

---
 static/resources/js/components/log/list-log.directive.js   | 6 ++----
 .../js/components/repository/list-repository.directive.js  | 7 ++-----
 static/resources/js/layout/project/project.controller.js   | 4 ++--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/static/resources/js/components/log/list-log.directive.js b/static/resources/js/components/log/list-log.directive.js
index 3925a95d3..04fb3fcd3 100644
--- a/static/resources/js/components/log/list-log.directive.js
+++ b/static/resources/js/components/log/list-log.directive.js
@@ -56,14 +56,12 @@
     vm.pageSize = 20;            
 
     $scope.$watch('vm.page', function(current, origin) {
-      if(current !== 1) {
+      if(current) {
         vm.page = current;
         retrieve(vm.queryParams, vm.page, vm.pageSize);
       }
     }); 
-    
-    retrieve(vm.queryParams, vm.page, vm.pageSize);
-  
+      
     $scope.$on('$locationChangeSuccess', function() {
             
       vm.projectId = getParameterByName('project_id', $location.absUrl());
diff --git a/static/resources/js/components/repository/list-repository.directive.js b/static/resources/js/components/repository/list-repository.directive.js
index da6fecfe2..f9f33e6aa 100644
--- a/static/resources/js/components/repository/list-repository.directive.js
+++ b/static/resources/js/components/repository/list-repository.directive.js
@@ -48,7 +48,6 @@
     vm.tagCount = {};
     
     vm.projectId = getParameterByName('project_id', $location.absUrl());
-    vm.retrieve(); 
         
     $scope.$on('$locationChangeSuccess', function() {
       vm.projectId = getParameterByName('project_id', $location.absUrl());
@@ -62,11 +61,9 @@
         vm.repositories = current || [];
       }
     });
-    
-   
-    
+        
     $scope.$watch('vm.page', function(current) {
-      if(current !== 1) {
+      if(current) {
         vm.page = current;
         vm.retrieve();
       }
diff --git a/static/resources/js/layout/project/project.controller.js b/static/resources/js/layout/project/project.controller.js
index 2478189e6..075d422dd 100644
--- a/static/resources/js/layout/project/project.controller.js
+++ b/static/resources/js/layout/project/project.controller.js
@@ -30,7 +30,7 @@
     vm.publicity = 0;
     
     vm.page = 1;
-    vm.pageSize = 20;  
+    vm.pageSize = 10;  
      
     vm.retrieve = retrieve;
     vm.showAddProject = showAddProject;
@@ -38,7 +38,6 @@
     vm.showAddButton = showAddButton;
     vm.togglePublicity = togglePublicity;    
     vm.user = currentUser.get();      
-    vm.retrieve();
     vm.getProjectRole = getProjectRole;
     
     vm.searchProjectByKeyPress = searchProjectByKeyPress;
@@ -134,6 +133,7 @@
     function togglePublicity(e) {
       vm.publicity = e.publicity;
       vm.isOpen = false;
+      vm.page = 1;
       vm.retrieve();
       console.log('vm.publicity:' + vm.publicity);
     }