From 2dab2137db92ecda5845ff84f2b8160bebd2f366 Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Tue, 5 Jul 2016 12:05:01 +0800
Subject: [PATCH 01/22] add auth check as registry does not distinguish 401 and
 403

---
 api/repository.go | 58 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/api/repository.go b/api/repository.go
index e90192a2a..a962c9dbc 100644
--- a/api/repository.go
+++ b/api/repository.go
@@ -39,8 +39,6 @@ import (
 
 // RepositoryAPI handles request to /api/repositories /api/repositories/tags /api/repositories/manifests, the parm has to be put
 // in the query string as the web framework can not parse the URL if it contains veriadic sectors.
-// For repostiories, we won't check the session in this API due to search functionality, querying manifest will be contorlled by
-// the security of registry
 type RepositoryAPI struct {
 	BaseAPI
 }
@@ -115,6 +113,20 @@ func (ra *RepositoryAPI) Delete() {
 		ra.CustomAbort(http.StatusBadRequest, "repo_name is nil")
 	}
 
+	projectName := getProjectName(repoName)
+	project, err := dao.GetProjectByName(projectName)
+	if err != nil {
+		log.Errorf("failed to get project %s: %v", projectName, err)
+		ra.CustomAbort(http.StatusInternalServerError, "")
+	}
+
+	if project.Public == 0 {
+		userID := ra.ValidateUser()
+		if !hasProjectAdminRole(userID, project.ProjectID) {
+			ra.CustomAbort(http.StatusForbidden, "")
+		}
+	}
+
 	rc, err := ra.initRepositoryClient(repoName)
 	if err != nil {
 		log.Errorf("error occurred while initializing repository client for %s: %v", repoName, err)
@@ -144,10 +156,6 @@ func (ra *RepositoryAPI) Delete() {
 		tags = append(tags, tag)
 	}
 
-	project := ""
-	if strings.Contains(repoName, "/") {
-		project = repoName[0:strings.LastIndex(repoName, "/")]
-	}
 	user, _, ok := ra.Ctx.Request.BasicAuth()
 	if !ok {
 		user, err = ra.getUsername()
@@ -169,7 +177,7 @@ func (ra *RepositoryAPI) Delete() {
 		go TriggerReplicationByRepository(repoName, []string{t}, models.RepOpDelete)
 
 		go func(tag string) {
-			if err := dao.AccessLog(user, project, repoName, tag, "delete"); err != nil {
+			if err := dao.AccessLog(user, projectName, repoName, tag, "delete"); err != nil {
 				log.Errorf("failed to add access log: %v", err)
 			}
 		}(t)
@@ -195,6 +203,20 @@ func (ra *RepositoryAPI) GetTags() {
 		ra.CustomAbort(http.StatusBadRequest, "repo_name is nil")
 	}
 
+	projectName := getProjectName(repoName)
+	project, err := dao.GetProjectByName(projectName)
+	if err != nil {
+		log.Errorf("failed to get project %s: %v", projectName, err)
+		ra.CustomAbort(http.StatusInternalServerError, "")
+	}
+
+	if project.Public == 0 {
+		userID := ra.ValidateUser()
+		if !checkProjectPermission(userID, project.ProjectID) {
+			ra.CustomAbort(http.StatusForbidden, "")
+		}
+	}
+
 	rc, err := ra.initRepositoryClient(repoName)
 	if err != nil {
 		log.Errorf("error occurred while initializing repository client for %s: %v", repoName, err)
@@ -230,6 +252,20 @@ func (ra *RepositoryAPI) GetManifests() {
 		ra.CustomAbort(http.StatusBadRequest, "repo_name or tag is nil")
 	}
 
+	projectName := getProjectName(repoName)
+	project, err := dao.GetProjectByName(projectName)
+	if err != nil {
+		log.Errorf("failed to get project %s: %v", projectName, err)
+		ra.CustomAbort(http.StatusInternalServerError, "")
+	}
+
+	if project.Public == 0 {
+		userID := ra.ValidateUser()
+		if !checkProjectPermission(userID, project.ProjectID) {
+			ra.CustomAbort(http.StatusForbidden, "")
+		}
+	}
+
 	rc, err := ra.initRepositoryClient(repoName)
 	if err != nil {
 		log.Errorf("error occurred while initializing repository client for %s: %v", repoName, err)
@@ -362,3 +398,11 @@ func newRepositoryClient(endpoint string, insecure bool, username, password, rep
 	}
 	return client, nil
 }
+
+func getProjectName(repository string) string {
+	project := ""
+	if strings.Contains(repository, "/") {
+		project = repository[0:strings.LastIndex(repository, "/")]
+	}
+	return project
+}

From 6f7c2aa5a546b7663694037527e52843b106b330 Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Tue, 5 Jul 2016 18:57:04 +0800
Subject: [PATCH 02/22] return count of jobs which are failed when listing
 policies

---
 dao/replication_job.go    |  8 +++++---
 models/replication_job.go | 13 +++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/dao/replication_job.go b/dao/replication_job.go
index f0d4782cd..9b0f6c838 100644
--- a/dao/replication_job.go
+++ b/dao/replication_job.go
@@ -150,10 +150,12 @@ func FilterRepPolicies(name string, projectID int64) ([]*models.RepPolicy, error
 
 	sql := `select rp.id, rp.project_id, p.name as project_name, rp.target_id, 
 				rt.name as target_name, rp.name, rp.enabled, rp.description,
-				rp.cron_str, rp.start_time, rp.creation_time, rp.update_time  
+				rp.cron_str, rp.start_time, rp.creation_time, rp.update_time, 
+				count(rj.status) as error_job_count 
 			from replication_policy rp 
-			join project p on rp.project_id=p.project_id 
-			join replication_target rt on rp.target_id=rt.id `
+			left join project p on rp.project_id=p.project_id 
+			left join replication_target rt on rp.target_id=rt.id 
+			left join replication_job rj on rp.id=rj.policy_id and rj.status="error" `
 
 	if len(name) != 0 && projectID != 0 {
 		sql += `where rp.name like ? and rp.project_id = ? `
diff --git a/models/replication_job.go b/models/replication_job.go
index 59c2ad375..8d847f9b0 100644
--- a/models/replication_job.go
+++ b/models/replication_job.go
@@ -56,12 +56,13 @@ type RepPolicy struct {
 	TargetName  string `json:"target_name,omitempty"`
 	Name        string `orm:"column(name)" json:"name"`
 	//	Target       RepTarget `orm:"-" json:"target"`
-	Enabled      int       `orm:"column(enabled)" json:"enabled"`
-	Description  string    `orm:"column(description)" json:"description"`
-	CronStr      string    `orm:"column(cron_str)" json:"cron_str"`
-	StartTime    time.Time `orm:"column(start_time)" json:"start_time"`
-	CreationTime time.Time `orm:"column(creation_time);auto_now_add" json:"creation_time"`
-	UpdateTime   time.Time `orm:"column(update_time);auto_now" json:"update_time"`
+	Enabled       int       `orm:"column(enabled)" json:"enabled"`
+	Description   string    `orm:"column(description)" json:"description"`
+	CronStr       string    `orm:"column(cron_str)" json:"cron_str"`
+	StartTime     time.Time `orm:"column(start_time)" json:"start_time"`
+	CreationTime  time.Time `orm:"column(creation_time);auto_now_add" json:"creation_time"`
+	UpdateTime    time.Time `orm:"column(update_time);auto_now" json:"update_time"`
+	ErrorJobCount int       `json:"error_job_count"`
 }
 
 // Valid ...

From 0f557d54ef9197bc5811d45ee5eb37a02108386e Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Wed, 6 Jul 2016 11:44:58 +0800
Subject: [PATCH 03/22] count status 'retrying'

---
 dao/replication_job.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dao/replication_job.go b/dao/replication_job.go
index 9b0f6c838..5c14eb805 100644
--- a/dao/replication_job.go
+++ b/dao/replication_job.go
@@ -155,7 +155,8 @@ func FilterRepPolicies(name string, projectID int64) ([]*models.RepPolicy, error
 			from replication_policy rp 
 			left join project p on rp.project_id=p.project_id 
 			left join replication_target rt on rp.target_id=rt.id 
-			left join replication_job rj on rp.id=rj.policy_id and rj.status="error" `
+			left join replication_job rj on rp.id=rj.policy_id and (rj.status="error" 
+				or rj.status="retrying") group by rp.id `
 
 	if len(name) != 0 && projectID != 0 {
 		sql += `where rp.name like ? and rp.project_id = ? `

From 51627d4d406891762ad2e8024acd94571bffae10 Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Wed, 6 Jul 2016 12:18:59 +0800
Subject: [PATCH 04/22] pass go test

---
 dao/dao_test.go        | 44 +++++++++++++++++++++---------------------
 dao/replication_job.go |  4 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dao/dao_test.go b/dao/dao_test.go
index 5a17986fc..699224700 100644
--- a/dao/dao_test.go
+++ b/dao/dao_test.go
@@ -1139,24 +1139,40 @@ func TestGetRepPolicyByProject(t *testing.T) {
 func TestGetRepJobByPolicy(t *testing.T) {
 	jobs, err := GetRepJobByPolicy(999)
 	if err != nil {
-		log.Errorf("Error occured in GetRepJobByPolicy: %v, policy ID: %d", err, 999)
+		t.Errorf("Error occured in GetRepJobByPolicy: %v, policy ID: %d", err, 999)
 		return
 	}
 	if len(jobs) > 0 {
-		log.Errorf("Unexpected length of jobs, expected: 0, in fact: %d", len(jobs))
+		t.Errorf("Unexpected length of jobs, expected: 0, in fact: %d", len(jobs))
 		return
 	}
 	jobs, err = GetRepJobByPolicy(policyID)
 	if err != nil {
-		log.Errorf("Error occured in GetRepJobByPolicy: %v, policy ID: %d", err, policyID)
+		t.Errorf("Error occured in GetRepJobByPolicy: %v, policy ID: %d", err, policyID)
 		return
 	}
 	if len(jobs) != 1 {
-		log.Errorf("Unexpected length of jobs, expected: 1, in fact: %d", len(jobs))
+		t.Errorf("Unexpected length of jobs, expected: 1, in fact: %d", len(jobs))
 		return
 	}
 	if jobs[0].ID != jobID {
-		log.Errorf("Unexpected job ID in the result, expected: %d, in fact: %d", jobID, jobs[0].ID)
+		t.Errorf("Unexpected job ID in the result, expected: %d, in fact: %d", jobID, jobs[0].ID)
+		return
+	}
+}
+
+func TestFilterRepJobs(t *testing.T) {
+	jobs, err := FilterRepJobs(policyID, "", "", nil, nil, 1000)
+	if err != nil {
+		t.Errorf("Error occured in FilterRepJobs: %v, policy ID: %d", err, policyID)
+		return
+	}
+	if len(jobs) != 1 {
+		t.Errorf("Unexpected length of jobs, expected: 1, in fact: %d", len(jobs))
+		return
+	}
+	if jobs[0].ID != jobID {
+		t.Errorf("Unexpected job ID in the result, expected: %d, in fact: %d", jobID, jobs[0].ID)
 		return
 	}
 }
@@ -1179,22 +1195,6 @@ func TestDeleteRepJob(t *testing.T) {
 	}
 }
 
-func TestFilterRepJobs(t *testing.T) {
-	jobs, err := FilterRepJobs(policyID, "", "", nil, nil, 1000)
-	if err != nil {
-		log.Errorf("Error occured in FilterRepJobs: %v, policy ID: %d", err, policyID)
-		return
-	}
-	if len(jobs) != 1 {
-		log.Errorf("Unexpected length of jobs, expected: 1, in fact: %d", len(jobs))
-		return
-	}
-	if jobs[0].ID != jobID {
-		log.Errorf("Unexpected job ID in the result, expected: %d, in fact: %d", jobID, jobs[0].ID)
-		return
-	}
-}
-
 func TestGetRepoJobToStop(t *testing.T) {
 	jobs := [...]models.RepJob{
 		models.RepJob{
@@ -1265,7 +1265,7 @@ func TestDeleteRepTarget(t *testing.T) {
 func TestFilterRepPolicies(t *testing.T) {
 	_, err := FilterRepPolicies("name", 0)
 	if err != nil {
-		t.Fatalf("failed to filter policy")
+		t.Fatalf("failed to filter policy: %v", err)
 	}
 }
 
diff --git a/dao/replication_job.go b/dao/replication_job.go
index 5c14eb805..adc47391c 100644
--- a/dao/replication_job.go
+++ b/dao/replication_job.go
@@ -156,7 +156,7 @@ func FilterRepPolicies(name string, projectID int64) ([]*models.RepPolicy, error
 			left join project p on rp.project_id=p.project_id 
 			left join replication_target rt on rp.target_id=rt.id 
 			left join replication_job rj on rp.id=rj.policy_id and (rj.status="error" 
-				or rj.status="retrying") group by rp.id `
+				or rj.status="retrying") `
 
 	if len(name) != 0 && projectID != 0 {
 		sql += `where rp.name like ? and rp.project_id = ? `
@@ -170,7 +170,7 @@ func FilterRepPolicies(name string, projectID int64) ([]*models.RepPolicy, error
 		args = append(args, projectID)
 	}
 
-	sql += `order by rp.creation_time`
+	sql += `group by rp.id order by rp.creation_time`
 
 	var policies []*models.RepPolicy
 	if _, err := o.Raw(sql, args).QueryRows(&policies); err != nil {

From 5e30a08262318e440a6d05e51b0dc2e23a028132 Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 12:24:09 +0800
Subject: [PATCH 05/22] Update header-include.htm

add new page for change password
---
 views/sections/header-include.htm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/sections/header-include.htm b/views/sections/header-include.htm
index a78d61c1b..f24ad0041 100644
--- a/views/sections/header-include.htm
+++ b/views/sections/header-include.htm
@@ -66,6 +66,9 @@
 <script src="/static/resources/js/layout/forgot-password/forgot-password.module.js"></script>
 <script src="/static/resources/js/layout/forgot-password/forgot-password.controller.js"></script>
 
+<script src="/static/resources/js/layout/change-password/change-password.module.js"></script>
+<script src="/static/resources/js/layout/change-password/change-password.controller.js"></script>
+
 <script src="/static/resources/js/layout/reset-password/reset-password.module.js"></script>
 <script src="/static/resources/js/layout/reset-password/reset-password.controller.js"></script>
 
@@ -243,4 +246,4 @@
 <script src="/static/resources/js/components/inline-help/inline-help.directive.js"></script>
 
 <script src="/static/resources/js/components/dismissable-alerts/dismissable-alerts.module.js"></script>
-<script src="/static/resources/js/components/dismissable-alerts/dismissable-alerts.directive.js"></script>
\ No newline at end of file
+<script src="/static/resources/js/components/dismissable-alerts/dismissable-alerts.directive.js"></script>

From 395f844b7a722499fafd688ad69fd8c906faafca Mon Sep 17 00:00:00 2001
From: yhua <a@b.com>
Date: Wed, 6 Jul 2016 13:09:32 +0800
Subject: [PATCH 06/22] add new page for change password

---
 controllers/changepassword.go                 |  11 ++
 .../account-setting.controller.js             |  43 +-------
 .../change-password.controller.js             | 104 ++++++++++++++++++
 .../change-password/change-password.module.js |   9 ++
 ui/router.go                                  |   1 +
 views/account-settings.htm                    |  56 ++--------
 views/change-password.htm                     |  63 +++++++++++
 7 files changed, 202 insertions(+), 85 deletions(-)
 create mode 100644 controllers/changepassword.go
 create mode 100644 static/resources/js/layout/change-password/change-password.controller.js
 create mode 100644 static/resources/js/layout/change-password/change-password.module.js
 create mode 100644 views/change-password.htm

diff --git a/controllers/changepassword.go b/controllers/changepassword.go
new file mode 100644
index 000000000..bbcac438c
--- /dev/null
+++ b/controllers/changepassword.go
@@ -0,0 +1,11 @@
+package controllers
+
+// AccountPwdSettingController handles request to /account_setting
+type ChangePasswordController struct {
+	BaseController
+}
+
+// Get renders the account settings page
+func (asc *ChangePasswordController) Get() {
+	asc.Forward("page_title_reset_password", "change-password.htm")
+}
diff --git a/static/resources/js/layout/account-setting/account-setting.controller.js b/static/resources/js/layout/account-setting/account-setting.controller.js
index 6a8a0a46f..c79bfe610 100644
--- a/static/resources/js/layout/account-setting/account-setting.controller.js
+++ b/static/resources/js/layout/account-setting/account-setting.controller.js
@@ -17,7 +17,6 @@
     vm.errorMessage = '';
     
     vm.reset = reset;    
-    vm.toggleChangePassword = toggleChangePassword;
     vm.confirm = confirm;
     vm.updateUser = updateUser;
     vm.cancel = cancel;
@@ -52,14 +51,6 @@
       vm.errorMessage = '';
     }
      
-    function toggleChangePassword() {
-      if(vm.isOpen) {
-        vm.isOpen = false;
-      }else{
-        vm.isOpen = true;
-      }     
-    }
-    
     function confirm() {     
       $window.location.href = '/dashboard';
     }    
@@ -67,37 +58,15 @@
     function updateUser(user) {
       vm.confirmOnly = true;
       vm.action = vm.confirm;
-      if(vm.isOpen){
-        if(user && angular.isDefined(user.oldPassword) && angular.isDefined(user.password)) {
-          ChangePasswordService(userId, user.oldPassword, user.password)
-            .success(changePasswordSuccess)
-            .error(changePasswordFailed);
-        }
-      }else{
-        if(user && angular.isDefined(user.username) && angular.isDefined(user.password) && 
+      if(user && angular.isDefined(user.username) && angular.isDefined(user.password) && 
             angular.isDefined(user.realname)) {
-          UpdateUserService(userId, user)
-            .success(updateUserSuccess)
-            .error(updateUserFailed); 
-          currentUser.set(user);        
-        }
+        UpdateUserService(userId, user)
+          .success(updateUserSuccess)
+          .error(updateUserFailed); 
+        currentUser.set(user);        
       }
     }
-    
-    function changePasswordSuccess(data, status) {
-      vm.modalTitle = $filter('tr')('change_password', []);
-      vm.modalMessage = $filter('tr')('successful_changed_password', []);
-      $scope.$broadcast('showDialog', true);
-    }
-    
-    function changePasswordFailed(data, status) {
-      console.log('Failed to changed password:' + data);
-      if(data == 'old_password_is_not_correct') {
-        vm.hasError = true;
-        vm.errorMessage = 'old_password_is_incorrect';
-      }
-    }
-    
+        
     function updateUserSuccess(data, status) {
       vm.modalTitle = $filter('tr')('change_profile', []);
       vm.modalMessage = $filter('tr')('successful_changed_profile', []);
diff --git a/static/resources/js/layout/change-password/change-password.controller.js b/static/resources/js/layout/change-password/change-password.controller.js
new file mode 100644
index 000000000..28f73dac3
--- /dev/null
+++ b/static/resources/js/layout/change-password/change-password.controller.js
@@ -0,0 +1,104 @@
+(function() {
+  
+  'use strict';
+  
+  angular
+    .module('harbor.layout.change.password')
+    .controller('ChangePasswordController', ChangePasswordController);
+  
+  ChangePasswordController.$inject = ['ChangePasswordService', 'UpdateUserService', '$filter', 'trFilter', '$scope', '$window', 'currentUser'];
+  
+  function ChangePasswordController(ChangePasswordService, UpdateUserService, $filter, trFilter, $scope, $window, currentUser) {
+
+    var vm = this;
+    vm.isOpen = false;
+ 
+    vm.hasError = false;
+    vm.errorMessage = '';
+    
+    vm.reset = reset;    
+    vm.toggleChangePassword = toggleChangePassword;
+    vm.confirm = confirm;
+    vm.updatePassword = updatePassword;
+    vm.cancel = cancel;
+    
+    $scope.user = currentUser.get();
+    var userId = $scope.user.user_id;
+
+    //Error message dialog handler for account setting.
+    $scope.$on('modalTitle', function(e, val) {
+      vm.modalTitle = val;
+    });
+    
+    $scope.$on('modalMessage', function(e, val) {
+      vm.modalMessage = val;
+    });
+       
+    $scope.$on('raiseError', function(e, val) {
+      if(val) {   
+        vm.action = function() {
+          $scope.$broadcast('showDialog', false);
+        };
+        vm.contentType = 'text/plain';    
+        vm.confirmOnly = true;  
+        $scope.$broadcast('showDialog', true);
+      }
+    });
+        
+    function reset() {
+      $scope.form.$setUntouched();
+      $scope.form.$setPristine();
+      vm.hasError = false;
+      vm.errorMessage = '';
+    }
+     
+    function toggleChangePassword() {
+      if(vm.isOpen) {
+        vm.isOpen = false;
+      }else{
+        vm.isOpen = true;
+      }     
+    }
+    
+    function confirm() {     
+      $window.location.href = '/dashboard';
+    }    
+                
+    function updatePassword(user) {
+      if(user && angular.isDefined(user.oldPassword) && angular.isDefined(user.password)) {
+        vm.action = vm.confirm;
+        ChangePasswordService(userId, user.oldPassword, user.password)
+          .success(changePasswordSuccess)
+          .error(changePasswordFailed);
+      }
+     
+    }
+    
+    function changePasswordSuccess(data, status) {
+      vm.modalTitle = $filter('tr')('change_password', []);
+      vm.modalMessage = $filter('tr')('successful_changed_password', []);
+      $scope.$broadcast('showDialog', true);
+    }
+    
+    function changePasswordFailed(data, status) {
+
+      var message;
+      $scope.$emit('modalTitle', $filter('tr')('error'));
+      console.log('Failed to changed password:' + data);
+      if(data == 'old_password_is_not_correct') {
+        message = $filter('tr')('old_password_is_incorrect');
+      }else{
+        message = $filter('tr')('fail_change_password');
+      }
+
+      $scope.$emit('modalMessage', message);
+      $scope.$emit('raiseError', true);
+    }
+    
+    function cancel(form) {
+      $window.location.href = '/dashboard';
+    }
+    
+  }
+  
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/change-password/change-password.module.js b/static/resources/js/layout/change-password/change-password.module.js
new file mode 100644
index 000000000..c0655b324
--- /dev/null
+++ b/static/resources/js/layout/change-password/change-password.module.js
@@ -0,0 +1,9 @@
+(function() {
+  
+  'use strict';
+  
+  angular
+    .module('harbor.layout.change.password', [
+    'harbor.services.user']);
+  
+})();
\ No newline at end of file
diff --git a/ui/router.go b/ui/router.go
index 4fe8a4184..b35d53229 100644
--- a/ui/router.go
+++ b/ui/router.go
@@ -37,6 +37,7 @@ func initRouters() {
 	beego.Router("/sign_up", &controllers.SignUpController{})
 	beego.Router("/add_new", &controllers.AddNewController{})
 	beego.Router("/account_setting", &controllers.AccountSettingController{})
+	beego.Router("/change_password", &controllers.ChangePasswordController{})
 	beego.Router("/admin_option", &controllers.AdminOptionController{})
 	beego.Router("/forgot_password", &controllers.ForgotPasswordController{})
 	beego.Router("/reset_password", &controllers.ResetPasswordController{})
diff --git a/views/account-settings.htm b/views/account-settings.htm
index bf5d38c54..95d167b4c 100644
--- a/views/account-settings.htm
+++ b/views/account-settings.htm
@@ -15,8 +15,8 @@
             <div class="form-group">
               <label for="email" class="col-sm-3 control-label">// 'email' | tr //:</label>
               <div class="col-sm-7">
-                <input type="email" class="form-control" id="email" ng-model="user.email" name="uEmail"  ng-disabled="vm.isOpen" required>
-                <div ng-messages="form.$submitted && form.uEmail.$error">
+                <input type="email" class="form-control" id="email" ng-model="user.email" name="uEmail"  required>
+                <div class="error-message" ng-messages="form.uEmail.$touched && form.uEmail.$error">
                   <span ng-message="required">// 'email_is_required' | tr //</span>
                   <span ng-message="email">// 'email_content_illegal' | tr //</span>
                 </div>
@@ -28,8 +28,8 @@
             <div class="form-group">
               <label for="fullName" class="col-sm-3 control-label">// 'full_name' | tr //:</label>
               <div class="col-sm-7"> 
-                <input type="text" class="form-control" id="fullName" ng-model="user.realname" name="uFullName" ng-disabled="vm.isOpen" required maxlength="20" invalid-chars>
-                <div ng-messages="form.$submitted && form.uFullName.$error">
+                <input type="text" class="form-control" id="fullName" ng-model="user.realname" name="uFullName" required maxlength="20" invalid-chars>
+                <div class="error-message" ng-messages="form.uFullName.$touched && form.uFullName.$error">
                   <span ng-message="required">// 'full_name_is_required' | tr //</span>
                   <span ng-message="invalidChars">// 'full_name_contains_illegal_chars' | tr //</span>
                   <span ng-message="maxlength">// 'full_name_is_too_long' | tr //</span>
@@ -42,56 +42,16 @@
             <div class="form-group">
               <label for="comments" class="col-sm-3 control-label">// 'comments' | tr //:</label>
               <div class="col-sm-7">
-                <input type="text" class="form-control" id="comments" ng-model="user.comment" name="uComments" ng-disabled="vm.isOpen" maxlength="20">
-                <div ng-messages="form.$submitted && form.uComments.$error">
+                <input type="text" class="form-control" id="comments" ng-model="user.comment" name="uComments" maxlength="20">
+                <div class="error-message" ng-messages="form.uComments.$touched && form.uComments.$error">
                   <span ng-show="maxlength">// 'comment_is_too_long' | tr //</span>
                 </div>
               </div>
             </div>          
             <div class="form-group">
-              <label for="toggleChangePassword" class="col-sm-3 control-label"><a id="toggleChangePassword" href="#" ng-click="vm.toggleChangePassword()">// 'change_password' | tr //</a></label>
-            </div>
-            <div ng-show="vm.isOpen">
-              <hr/>
-              <div class="form-group">
-                <label for="oldPassword" class="col-sm-3 control-label">// 'old_password' | tr //:</label>
-                <div class="col-sm-7">
-                  <input type="password" class="form-control" id="oldPassword" ng-model="user.oldPassword" ng-change="vm.reset()" name="uOldPassword" required>
-                  <div class="error-message" ng-messages="vm.isOpen && form.$submitted && form.uOldPassword.$touched && form.uOldPassword.$error">
-                    <span ng-message="required">// 'old_password_is_required' | tr //</span>
-                  </div> 
-                </div>
-                <div class="col-sm-2">
-                  <span class="asterisk">*</span>
-                </div>
-              </div>
-              <div class="form-group">
-                <label for="password" class="col-sm-3 control-label">// 'new_password' | tr //:</label>
-                <div class="col-sm-7">
-                  <input type="password" class="form-control" id="password" ng-model="user.password" ng-change="vm.reset()" name="uPassword" required password>
-                  <div class="error-message" ng-messages="vm.isOpen && form.$submitted && form.uPassword.$touched && form.uPassword.$error">
-                    <span ng-message="required">// 'password_is_required' | tr //</span>
-                    <span ng-message="password">// 'password_is_invalid' | tr //</span>
-                  </div>
-                  <p class="help-block small-size-fonts">// 'password_desc' | tr //</p>
-                </div>
-                <div class="col-sm-2">
-                  <span class="asterisk">*</span>
-                </div>
-              </div>
-              <div class="form-group">
-                <label for="confirmPassword" class="col-sm-3 control-label">// 'confirm_password' | tr //:</label>
-                <div class="col-sm-7">
-                  <input type="password" class="form-control" id="confirmPassword" ng-model="user.confirmPassword" ng-change="vm.reset()" name="uConfirmPassword" ng-model-options="{ updateOn: 'blur' }" compare-to="user.password">
-                  <div class="error-message" ng-messages="vm.isOpen && form.$submitted && form.uConfirmPassword.$touched && form.uConfirmPassword.$error">
-                    <span ng-message="compareTo">// 'password_does_not_match' | tr //</span>
-                  </div>
-                </div>
-                <div class="col-sm-2">
-                  <span class="asterisk">*</span>
-                </div>
-              </div>
+              <label for="toggleChangePassword" class="col-sm-3 control-label"><a id="toggleChangePassword" href="/change_password" >// 'change_password' | tr //</a></label>
             </div>
+            
             <div class="form-group">
               <div class="col-md-offset-7 col-md-10">
                 <input type="submit" class="btn btn-primary" ng-click="vm.updateUser(user)" value="// 'save' | tr //">                    
diff --git a/views/change-password.htm b/views/change-password.htm
new file mode 100644
index 000000000..62267f08d
--- /dev/null
+++ b/views/change-password.htm
@@ -0,0 +1,63 @@
+<div class="container-fluid container-fluid-custom" element-height ng-controller="ChangePasswordController as vm">
+  <modal-dialog modal-title="// vm.modalTitle //" modal-message="// vm.modalMessage //" confirm-only="vm.confirmOnly" action="vm.action()"></modal-dialog>
+  <div class="container container-custom">
+    <div class="row extend-height">
+	    <div class="section">
+		    <h1 class="col-md-12 col-md-offset-2 main-title title-color">// 'change_password' | tr //</h1>
+        <div class="col-md-12 col-md-offset-2 main-content">
+          <form name="form" class="css-form form-horizontal" novalidate>              
+            <div>
+              <div class="form-group">
+                <label for="oldPassword" class="col-sm-3 control-label">// 'old_password' | tr //:</label>
+                <div class="col-sm-7">
+                  <input type="password" class="form-control" id="oldPassword" ng-model="user.oldPassword" ng-change="vm.reset()" name="uOldPassword" required>
+                  <div class="error-message" ng-messages="form.uOldPassword.$touched && form.uOldPassword.$error">
+                    <span ng-message="required">// 'old_password_is_required' | tr //</span>
+                  </div> 
+                </div>
+                <div class="col-sm-2">
+                  <span class="asterisk">*</span>
+                </div>
+              </div>
+              <div class="form-group">
+                <label for="password" class="col-sm-3 control-label">// 'new_password' | tr //:</label>
+                <div class="col-sm-7">
+                  <input type="password" class="form-control" id="password" ng-model="user.password" ng-change="vm.reset()" name="uPassword" required password>
+                  <div class="error-message" ng-messages="form.uPassword.$touched && form.uPassword.$error">
+                    <span ng-message="required">// 'password_is_required' | tr //</span>
+                    <span ng-message="password">// 'password_is_invalid' | tr //</span>
+                  </div>
+                  <p class="help-block small-size-fonts">// 'password_desc' | tr //</p>
+                </div>
+                <div class="col-sm-2">
+                  <span class="asterisk">*</span>
+                </div>
+              </div>
+              <div class="form-group">
+                <label for="confirmPassword" class="col-sm-3 control-label">// 'confirm_password' | tr //:</label>
+                <div class="col-sm-7">
+                  <input type="password" class="form-control" id="confirmPassword" ng-model="user.confirmPassword" ng-change="vm.reset()" name="uConfirmPassword" ng-model-options="{ updateOn: 'blur' }" compare-to="user.password">
+                  <div class="error-message" ng-messages="form.uConfirmPassword.$touched && form.uConfirmPassword.$error">
+                    <span ng-message="compareTo">// 'password_does_not_match' | tr //</span>
+                  </div>
+                </div>
+                <div class="col-sm-2">
+                  <span class="asterisk">*</span>
+                </div>
+              </div>
+            </div>
+            <div class="form-group">
+              <div class="col-md-offset-7 col-md-10">
+                <input type="submit" class="btn btn-primary" ng-click="form.$valid && vm.updatePassword(user)" value="// 'save' | tr //">                    
+                <input type="button" class="btn btn-default" ng-click="vm.cancel(form)" value="// 'cancel' | tr //">
+              </div>
+            </div>  
+            <div class="error-message">
+              <span ng-show="vm.hasError">// vm.errorMessage | tr //</span>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file

From caf82ef3bdb73e2b69673b4f02009288e4897246 Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 13:32:16 +0800
Subject: [PATCH 07/22] Update harbor.module.js

add page for change password
---
 static/resources/js/harbor.module.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/static/resources/js/harbor.module.js b/static/resources/js/harbor.module.js
index d92272c75..8fe5eda2a 100644
--- a/static/resources/js/harbor.module.js
+++ b/static/resources/js/harbor.module.js
@@ -13,6 +13,7 @@
       'harbor.layout.sign.up',
       'harbor.layout.add.new',
       'harbor.layout.account.setting',
+      'harbor.layout.change.password',
       'harbor.layout.forgot.password',
       'harbor.layout.reset.password',
       'harbor.layout.index',
@@ -48,4 +49,4 @@
       'harbor.inline.help',
       'harbor.dismissable.alerts'
     ]);
-})();
\ No newline at end of file
+})();

From aa1d44ecdbe49e7047b7774edd0c98fd8016a8d6 Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 13:34:02 +0800
Subject: [PATCH 08/22] Update locale_messages_en-US.js

add 'fail_change_password': 'Password change fail.'
---
 static/resources/js/services/i18n/locale_messages_en-US.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/static/resources/js/services/i18n/locale_messages_en-US.js b/static/resources/js/services/i18n/locale_messages_en-US.js
index efed44a9e..4797e4d9f 100644
--- a/static/resources/js/services/i18n/locale_messages_en-US.js
+++ b/static/resources/js/services/i18n/locale_messages_en-US.js
@@ -47,6 +47,7 @@ var locale_messages = {
   'forgot_password_description': 'Please input the Email used when you signed up, a reset password Email will be sent to you.',
   'reset_password': 'Reset Password',
   'successful_reset_password': 'Password has been reset successfully.',
+  'fail_change_password': 'Password change fail.',
   'summary': 'Summary',
   'projects': 'Projects',
   'public_projects': 'Public Projects', 
@@ -249,4 +250,4 @@ var locale_messages = {
   'inline_help_publicity': 'Setting the project as public.',
   'alert_job_contains_error': 'There contain errors in current replication jobs results, please look into it.',
   'caution': 'Caution'
-};
\ No newline at end of file
+};

From c258a64e639f667c80d686994040c0ec77b8cdcf Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 13:34:41 +0800
Subject: [PATCH 09/22] Update locale_messages_zh-CN.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

add 'fail_change_password': '修改密码失败。'
---
 static/resources/js/services/i18n/locale_messages_zh-CN.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/static/resources/js/services/i18n/locale_messages_zh-CN.js b/static/resources/js/services/i18n/locale_messages_zh-CN.js
index 57872fbc2..d9a3be022 100644
--- a/static/resources/js/services/i18n/locale_messages_zh-CN.js
+++ b/static/resources/js/services/i18n/locale_messages_zh-CN.js
@@ -47,6 +47,7 @@ var locale_messages = {
   'forgot_password_description': '重置邮件将发送到此邮箱。',
   'reset_password': '重置密码',
   'successful_reset_password': '重置密码成功。',
+  'fail_change_password': '修改密码失败。',
   'summary': '摘要',
   'projects': '项目',
   'public_projects': '公开项目',
@@ -248,4 +249,4 @@ var locale_messages = {
   'inline_help_publicity': '设置该项目为公开。',
   'alert_job_contains_error': '当前复制任务中包含错误，请检查。',
   'caution': '注意'
-};
\ No newline at end of file
+};

From 6ce18110cdf058caf640670c4cf024aa26b400d7 Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Wed, 6 Jul 2016 13:38:53 +0800
Subject: [PATCH 10/22] retry the job which failed because the network error

---
 job/replication/error.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/job/replication/error.go b/job/replication/error.go
index 197dabbd3..3ff0d8793 100644
--- a/job/replication/error.go
+++ b/job/replication/error.go
@@ -17,13 +17,18 @@ package replication
 
 import (
 	"net"
+	"syscall"
+)
+
+const (
+	connectionRefusedErr syscall.Errno = 0x6f
 )
 
 func retry(err error) bool {
 	if err == nil {
 		return false
 	}
-	return isTemporary(err)
+	return isNetworkErr(err)
 }
 
 func isTemporary(err error) bool {
@@ -32,3 +37,8 @@ func isTemporary(err error) bool {
 	}
 	return false
 }
+
+func isNetworkErr(err error) bool {
+	_, ok := err.(net.Error)
+	return ok
+}

From cb5fee842a781f07bf919cb59f352b5f7a177b44 Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Wed, 6 Jul 2016 13:40:54 +0800
Subject: [PATCH 11/22] remove useless codes

---
 job/replication/error.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/job/replication/error.go b/job/replication/error.go
index 3ff0d8793..19eedd129 100644
--- a/job/replication/error.go
+++ b/job/replication/error.go
@@ -17,11 +17,6 @@ package replication
 
 import (
 	"net"
-	"syscall"
-)
-
-const (
-	connectionRefusedErr syscall.Errno = 0x6f
 )
 
 func retry(err error) bool {

From f2610ef3ea81422d83d31cc64171bad02aee205f Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 14:00:48 +0800
Subject: [PATCH 12/22] Update changepassword.go

change comment
---
 controllers/changepassword.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/changepassword.go b/controllers/changepassword.go
index bbcac438c..3bdfd0dff 100644
--- a/controllers/changepassword.go
+++ b/controllers/changepassword.go
@@ -1,11 +1,11 @@
 package controllers
 
-// AccountPwdSettingController handles request to /account_setting
+// ChangePasswordController handles request to /change_password
 type ChangePasswordController struct {
 	BaseController
 }
 
-// Get renders the account settings page
+// Get renders the change password page
 func (asc *ChangePasswordController) Get() {
 	asc.Forward("page_title_reset_password", "change-password.htm")
 }

From db0c079b82296febf8ccb2ecb526b3a2d41807e0 Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 14:06:47 +0800
Subject: [PATCH 13/22] Update change-password.controller.js

remove password toggle
---
 .../change-password/change-password.controller.js    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/static/resources/js/layout/change-password/change-password.controller.js b/static/resources/js/layout/change-password/change-password.controller.js
index 28f73dac3..509fa3bd4 100644
--- a/static/resources/js/layout/change-password/change-password.controller.js
+++ b/static/resources/js/layout/change-password/change-password.controller.js
@@ -17,7 +17,7 @@
     vm.errorMessage = '';
     
     vm.reset = reset;    
-    vm.toggleChangePassword = toggleChangePassword;
+    
     vm.confirm = confirm;
     vm.updatePassword = updatePassword;
     vm.cancel = cancel;
@@ -52,14 +52,6 @@
       vm.errorMessage = '';
     }
      
-    function toggleChangePassword() {
-      if(vm.isOpen) {
-        vm.isOpen = false;
-      }else{
-        vm.isOpen = true;
-      }     
-    }
-    
     function confirm() {     
       $window.location.href = '/dashboard';
     }    
@@ -101,4 +93,4 @@
     
   }
   
-})();
\ No newline at end of file
+})();

From 21b3f5d48ea683d05a90fffc91dd67277ff691c4 Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 14:09:20 +0800
Subject: [PATCH 14/22] Update account-setting.controller.js

remove password check in updateUser().

- && angular.isDefined(user.password)
---
 .../js/layout/account-setting/account-setting.controller.js  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/static/resources/js/layout/account-setting/account-setting.controller.js b/static/resources/js/layout/account-setting/account-setting.controller.js
index c79bfe610..fbbcd53be 100644
--- a/static/resources/js/layout/account-setting/account-setting.controller.js
+++ b/static/resources/js/layout/account-setting/account-setting.controller.js
@@ -58,8 +58,7 @@
     function updateUser(user) {
       vm.confirmOnly = true;
       vm.action = vm.confirm;
-      if(user && angular.isDefined(user.username) && angular.isDefined(user.password) && 
-            angular.isDefined(user.realname)) {
+      if(user && angular.isDefined(user.username) && angular.isDefined(user.realname)) {
         UpdateUserService(userId, user)
           .success(updateUserSuccess)
           .error(updateUserFailed); 
@@ -92,4 +91,4 @@
     
   }
   
-})();
\ No newline at end of file
+})();

From 37fc63aacca4da682feae67d0a098bfe2ddd72cf Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Wed, 6 Jul 2016 14:12:16 +0800
Subject: [PATCH 15/22] add parameter 'num' to list jobs

---
 api/replication_job.go | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/api/replication_job.go b/api/replication_job.go
index 7ced0bcac..93ce92183 100644
--- a/api/replication_job.go
+++ b/api/replication_job.go
@@ -61,6 +61,7 @@ func (ra *RepJobAPI) List() {
 	var policyID int64
 	var repository, status string
 	var startTime, endTime *time.Time
+	var num int
 	var err error
 
 	policyIDStr := ra.GetString("policy_id")
@@ -71,6 +72,17 @@ func (ra *RepJobAPI) List() {
 		}
 	}
 
+	numStr := ra.GetString("num")
+	if len(numStr) != 0 {
+		num, err = strconv.Atoi(numStr)
+		if err != nil {
+			ra.CustomAbort(http.StatusBadRequest, fmt.Sprintf("invalid num: %s", numStr))
+		}
+	}
+	if num <= 0 {
+		num = 200
+	}
+
 	endTimeStr := ra.GetString("end_time")
 	if len(endTimeStr) != 0 {
 		i, err := strconv.ParseInt(endTimeStr, 10, 64)
@@ -100,7 +112,7 @@ func (ra *RepJobAPI) List() {
 	repository = ra.GetString("repository")
 	status = ra.GetString("status")
 
-	jobs, err := dao.FilterRepJobs(policyID, repository, status, startTime, endTime, 1000)
+	jobs, err := dao.FilterRepJobs(policyID, repository, status, startTime, endTime, num)
 	if err != nil {
 		log.Errorf("failed to filter jobs according policy ID %d, repository %s, status %s: %v", policyID, repository, status, err)
 		ra.RenderError(http.StatusInternalServerError, "Failed to query job")

From ac836bc203d555272d2d742a08cd2cd63ca6ced9 Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 14:18:50 +0800
Subject: [PATCH 16/22] Update change-password.controller.js

change fail message key to "failed_to_change_password"
---
 .../js/layout/change-password/change-password.controller.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/resources/js/layout/change-password/change-password.controller.js b/static/resources/js/layout/change-password/change-password.controller.js
index 509fa3bd4..69897052d 100644
--- a/static/resources/js/layout/change-password/change-password.controller.js
+++ b/static/resources/js/layout/change-password/change-password.controller.js
@@ -80,7 +80,7 @@
       if(data == 'old_password_is_not_correct') {
         message = $filter('tr')('old_password_is_incorrect');
       }else{
-        message = $filter('tr')('fail_change_password');
+        message = $filter('tr')('failed_to_change_password');
       }
 
       $scope.$emit('modalMessage', message);

From 46ad156d4ccbbb559993aa6e677a968d41f52a86 Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 14:19:37 +0800
Subject: [PATCH 17/22] Update locale_messages_zh-CN.js

change key to "failed_to_change_password"
---
 static/resources/js/services/i18n/locale_messages_zh-CN.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/resources/js/services/i18n/locale_messages_zh-CN.js b/static/resources/js/services/i18n/locale_messages_zh-CN.js
index d9a3be022..11ec32678 100644
--- a/static/resources/js/services/i18n/locale_messages_zh-CN.js
+++ b/static/resources/js/services/i18n/locale_messages_zh-CN.js
@@ -47,7 +47,7 @@ var locale_messages = {
   'forgot_password_description': '重置邮件将发送到此邮箱。',
   'reset_password': '重置密码',
   'successful_reset_password': '重置密码成功。',
-  'fail_change_password': '修改密码失败。',
+  'failed_to_change_password': '修改密码失败。',
   'summary': '摘要',
   'projects': '项目',
   'public_projects': '公开项目',

From f70b9f7e33a87f1911a477ce6aef3b81c779e26b Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 14:20:44 +0800
Subject: [PATCH 18/22] Update locale_messages_en-US.js

change key to "failed_to_change_password".
---
 static/resources/js/services/i18n/locale_messages_en-US.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/resources/js/services/i18n/locale_messages_en-US.js b/static/resources/js/services/i18n/locale_messages_en-US.js
index 4797e4d9f..47b7b53bf 100644
--- a/static/resources/js/services/i18n/locale_messages_en-US.js
+++ b/static/resources/js/services/i18n/locale_messages_en-US.js
@@ -47,7 +47,7 @@ var locale_messages = {
   'forgot_password_description': 'Please input the Email used when you signed up, a reset password Email will be sent to you.',
   'reset_password': 'Reset Password',
   'successful_reset_password': 'Password has been reset successfully.',
-  'fail_change_password': 'Password change fail.',
+  'failed_to_change_password': 'Failed to change password.',
   'summary': 'Summary',
   'projects': 'Projects',
   'public_projects': 'Public Projects', 

From c5a26cdd649694168cdaeea97fdb5a39fee06e0b Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 14:23:59 +0800
Subject: [PATCH 19/22] Update account-settings.htm

add form.$valid && on submit ng-click
---
 views/account-settings.htm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/account-settings.htm b/views/account-settings.htm
index 95d167b4c..1f16c147e 100644
--- a/views/account-settings.htm
+++ b/views/account-settings.htm
@@ -54,7 +54,7 @@
             
             <div class="form-group">
               <div class="col-md-offset-7 col-md-10">
-                <input type="submit" class="btn btn-primary" ng-click="vm.updateUser(user)" value="// 'save' | tr //">                    
+                <input type="submit" class="btn btn-primary" ng-click="form.$valid && vm.updateUser(user)" value="// 'save' | tr //">                    
                 <input type="button" class="btn btn-default" ng-click="vm.cancel(form)" value="// 'cancel' | tr //">
               </div>
             </div>  
@@ -66,4 +66,4 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>

From 8d1578a5550a38d8eef0c71f5db74a20d6b0b6e5 Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Wed, 6 Jul 2016 15:11:51 +0800
Subject: [PATCH 20/22] support retry when job failed

---
 job/replication/delete.go   |  22 ++++----
 job/replication/transfer.go | 104 ++++++++++++++++++++++--------------
 job/statemachine.go         |  25 ++++-----
 3 files changed, 83 insertions(+), 68 deletions(-)

diff --git a/job/replication/delete.go b/job/replication/delete.go
index ce8ef6a98..fbb764b47 100644
--- a/job/replication/delete.go
+++ b/job/replication/delete.go
@@ -44,14 +44,7 @@ type Deleter struct {
 }
 
 // NewDeleter returns a Deleter
-func NewDeleter(repository string, tags []string, dstURL, dstUsr, dstPwd string, insecure bool, logger *log.Logger) (*Deleter, error) {
-	dstCred := auth.NewBasicAuthCredential(dstUsr, dstPwd)
-	dstClient, err := newRepositoryClient(dstURL, insecure, dstCred,
-		repository, "repository", repository, "pull", "push", "*")
-	if err != nil {
-		return nil, err
-	}
-
+func NewDeleter(repository string, tags []string, dstURL, dstUsr, dstPwd string, insecure bool, logger *log.Logger) *Deleter {
 	deleter := &Deleter{
 		repository: repository,
 		tags:       tags,
@@ -59,12 +52,11 @@ func NewDeleter(repository string, tags []string, dstURL, dstUsr, dstPwd string,
 		dstUsr:     dstUsr,
 		dstPwd:     dstPwd,
 		insecure:   insecure,
-		dstClient:  dstClient,
 		logger:     logger,
 	}
 	deleter.logger.Infof("initialization completed: repository: %s, tags: %v, destination URL: %s, insecure: %v, destination user: %s",
 		deleter.repository, deleter.tags, deleter.dstURL, deleter.insecure, deleter.dstUsr)
-	return deleter, nil
+	return deleter
 }
 
 // Exit ...
@@ -81,10 +73,18 @@ func (d *Deleter) Enter() (string, error) {
 	}
 
 	return state, err
-
 }
 
 func (d *Deleter) enter() (string, error) {
+	dstCred := auth.NewBasicAuthCredential(d.dstUsr, d.dstPwd)
+	dstClient, err := newRepositoryClient(d.dstURL, d.insecure, dstCred,
+		d.repository, "repository", d.repository, "pull", "push", "*")
+	if err != nil {
+		d.logger.Errorf("an error occurred while creating destination repository client: %v", err)
+		return "", err
+	}
+
+	d.dstClient = dstClient
 
 	if len(d.tags) == 0 {
 		tags, err := d.dstClient.ListTag()
diff --git a/job/replication/transfer.go b/job/replication/transfer.go
index 4eee419f4..8ac3015bd 100644
--- a/job/replication/transfer.go
+++ b/job/replication/transfer.go
@@ -35,6 +35,8 @@ import (
 )
 
 const (
+	// StateInitialize ...
+	StateInitialize = "initialize"
 	// StateCheck ...
 	StateCheck = "check"
 	// StatePullManifest ...
@@ -56,7 +58,8 @@ type BaseHandler struct {
 	repository string // prject_name/repo_name
 	tags       []string
 
-	srcURL string // url of source registry
+	srcURL    string // url of source registry
+	srcSecret string
 
 	dstURL string // url of target registry
 	dstUsr string // username ...
@@ -76,18 +79,15 @@ type BaseHandler struct {
 	logger *log.Logger
 }
 
-// InitBaseHandler initializes a BaseHandler: creating clients for source and destination registry,
-// listing tags of the repository if parameter tags is nil.
+// InitBaseHandler initializes a BaseHandler.
 func InitBaseHandler(repository, srcURL, srcSecret,
-	dstURL, dstUsr, dstPwd string, insecure bool, tags []string, logger *log.Logger) (*BaseHandler, error) {
-
-	logger.Infof("initializing: repository: %s, tags: %v, source URL: %s, destination URL: %s, insecure: %v, destination user: %s",
-		repository, tags, srcURL, dstURL, insecure, dstUsr)
+	dstURL, dstUsr, dstPwd string, insecure bool, tags []string, logger *log.Logger) *BaseHandler {
 
 	base := &BaseHandler{
 		repository:     repository,
 		tags:           tags,
 		srcURL:         srcURL,
+		srcSecret:      srcSecret,
 		dstURL:         dstURL,
 		dstUsr:         dstUsr,
 		dstPwd:         dstPwd,
@@ -98,39 +98,7 @@ func InitBaseHandler(repository, srcURL, srcSecret,
 
 	base.project = getProjectName(base.repository)
 
-	c := &http.Cookie{Name: models.UISecretCookie, Value: srcSecret}
-	srcCred := auth.NewCookieCredential(c)
-	//	srcCred := auth.NewBasicAuthCredential("admin", "Harbor12345")
-	srcClient, err := newRepositoryClient(base.srcURL, base.insecure, srcCred,
-		base.repository, "repository", base.repository, "pull", "push", "*")
-	if err != nil {
-		base.logger.Errorf("an error occurred while creating source repository client: %v", err)
-		return nil, err
-	}
-	base.srcClient = srcClient
-
-	dstCred := auth.NewBasicAuthCredential(base.dstUsr, base.dstPwd)
-	dstClient, err := newRepositoryClient(base.dstURL, base.insecure, dstCred,
-		base.repository, "repository", base.repository, "pull", "push", "*")
-	if err != nil {
-		base.logger.Errorf("an error occurred while creating destination repository client: %v", err)
-		return nil, err
-	}
-	base.dstClient = dstClient
-
-	if len(base.tags) == 0 {
-		tags, err := base.srcClient.ListTag()
-		if err != nil {
-			base.logger.Errorf("an error occurred while listing tags for source repository: %v", err)
-			return nil, err
-		}
-		base.tags = tags
-	}
-
-	base.logger.Infof("initialization completed: project: %s, repository: %s, tags: %v, source URL: %s, destination URL: %s, insecure: %v, destination user: %s",
-		base.project, base.repository, base.tags, base.srcURL, base.dstURL, base.insecure, base.dstUsr)
-
-	return base, nil
+	return base
 }
 
 // Exit ...
@@ -144,6 +112,61 @@ func getProjectName(repository string) string {
 	return repository[:strings.LastIndex(repository, "/")]
 }
 
+// Initializer creates clients for source and destination registry,
+// lists tags of the repository if parameter tags is nil.
+type Initializer struct {
+	*BaseHandler
+}
+
+// Enter ...
+func (i *Initializer) Enter() (string, error) {
+	i.logger.Infof("initializing: repository: %s, tags: %v, source URL: %s, destination URL: %s, insecure: %v, destination user: %s",
+		i.repository, i.tags, i.srcURL, i.dstURL, i.insecure, i.dstUsr)
+
+	state, err := i.enter()
+	if err != nil && retry(err) {
+		i.logger.Info("waiting for retrying...")
+		return models.JobRetrying, nil
+	}
+
+	return state, err
+}
+
+func (i *Initializer) enter() (string, error) {
+	c := &http.Cookie{Name: models.UISecretCookie, Value: i.srcSecret}
+	srcCred := auth.NewCookieCredential(c)
+	srcClient, err := newRepositoryClient(i.srcURL, i.insecure, srcCred,
+		i.repository, "repository", i.repository, "pull", "push", "*")
+	if err != nil {
+		i.logger.Errorf("an error occurred while creating source repository client: %v", err)
+		return "", err
+	}
+	i.srcClient = srcClient
+
+	dstCred := auth.NewBasicAuthCredential(i.dstUsr, i.dstPwd)
+	dstClient, err := newRepositoryClient(i.dstURL, i.insecure, dstCred,
+		i.repository, "repository", i.repository, "pull", "push", "*")
+	if err != nil {
+		i.logger.Errorf("an error occurred while creating destination repository client: %v", err)
+		return "", err
+	}
+	i.dstClient = dstClient
+
+	if len(i.tags) == 0 {
+		tags, err := i.srcClient.ListTag()
+		if err != nil {
+			i.logger.Errorf("an error occurred while listing tags for source repository: %v", err)
+			return "", err
+		}
+		i.tags = tags
+	}
+
+	i.logger.Infof("initialization completed: project: %s, repository: %s, tags: %v, source URL: %s, destination URL: %s, insecure: %v, destination user: %s",
+		i.project, i.repository, i.tags, i.srcURL, i.dstURL, i.insecure, i.dstUsr)
+
+	return StateCheck, nil
+}
+
 // Checker checks the existence of project and the user's privlege to the project
 type Checker struct {
 	*BaseHandler
@@ -159,7 +182,6 @@ func (c *Checker) Enter() (string, error) {
 	}
 
 	return state, err
-
 }
 
 func (c *Checker) enter() (string, error) {
diff --git a/job/statemachine.go b/job/statemachine.go
index 8a1c007ff..95b306033 100644
--- a/job/statemachine.go
+++ b/job/statemachine.go
@@ -252,9 +252,9 @@ func (sm *SM) Reset(jid int64) error {
 
 	switch sm.Parms.Operation {
 	case models.RepOpTransfer:
-		err = addImgTransferTransition(sm)
+		addImgTransferTransition(sm)
 	case models.RepOpDelete:
-		err = addImgDeleteTransition(sm)
+		addImgDeleteTransition(sm)
 	default:
 		err = fmt.Errorf("unsupported operation: %s", sm.Parms.Operation)
 	}
@@ -268,31 +268,24 @@ func addTestTransition(sm *SM) error {
 	return nil
 }
 
-func addImgTransferTransition(sm *SM) error {
-	base, err := replication.InitBaseHandler(sm.Parms.Repository, sm.Parms.LocalRegURL, config.UISecret(),
+func addImgTransferTransition(sm *SM) {
+	base := replication.InitBaseHandler(sm.Parms.Repository, sm.Parms.LocalRegURL, config.UISecret(),
 		sm.Parms.TargetURL, sm.Parms.TargetUsername, sm.Parms.TargetPassword,
 		sm.Parms.Insecure, sm.Parms.Tags, sm.Logger)
-	if err != nil {
-		return err
-	}
-	sm.AddTransition(models.JobRunning, replication.StateCheck, &replication.Checker{BaseHandler: base})
+
+	sm.AddTransition(models.JobRunning, replication.StateInitialize, &replication.Initializer{BaseHandler: base})
+	sm.AddTransition(replication.StateInitialize, replication.StateCheck, &replication.Checker{BaseHandler: base})
 	sm.AddTransition(replication.StateCheck, replication.StatePullManifest, &replication.ManifestPuller{BaseHandler: base})
 	sm.AddTransition(replication.StatePullManifest, replication.StateTransferBlob, &replication.BlobTransfer{BaseHandler: base})
 	sm.AddTransition(replication.StatePullManifest, models.JobFinished, &StatusUpdater{sm.JobID, models.JobFinished})
 	sm.AddTransition(replication.StateTransferBlob, replication.StatePushManifest, &replication.ManifestPusher{BaseHandler: base})
 	sm.AddTransition(replication.StatePushManifest, replication.StatePullManifest, &replication.ManifestPuller{BaseHandler: base})
-	return nil
 }
 
-func addImgDeleteTransition(sm *SM) error {
-	deleter, err := replication.NewDeleter(sm.Parms.Repository, sm.Parms.Tags, sm.Parms.TargetURL,
+func addImgDeleteTransition(sm *SM) {
+	deleter := replication.NewDeleter(sm.Parms.Repository, sm.Parms.Tags, sm.Parms.TargetURL,
 		sm.Parms.TargetUsername, sm.Parms.TargetPassword, sm.Parms.Insecure, sm.Logger)
-	if err != nil {
-		return err
-	}
 
 	sm.AddTransition(models.JobRunning, replication.StateDelete, deleter)
 	sm.AddTransition(replication.StateDelete, models.JobFinished, &StatusUpdater{sm.JobID, models.JobFinished})
-
-	return nil
 }

From 2a915785d3ca4fc7b6f5a154a00ec5c6fc10ed7c Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 16:10:38 +0800
Subject: [PATCH 21/22] Update changepassword.go

use key "page_title_change_password"
---
 controllers/changepassword.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/changepassword.go b/controllers/changepassword.go
index 3bdfd0dff..0ecddb29c 100644
--- a/controllers/changepassword.go
+++ b/controllers/changepassword.go
@@ -7,5 +7,5 @@ type ChangePasswordController struct {
 
 // Get renders the change password page
 func (asc *ChangePasswordController) Get() {
-	asc.Forward("page_title_reset_password", "change-password.htm")
+	asc.Forward("page_title_change_password", "change-password.htm")
 }

From 977119150dd913fa3ac3d849bd29fcfa4c684dfd Mon Sep 17 00:00:00 2001
From: yhua123 <he_feng_yun@126.com>
Date: Wed, 6 Jul 2016 16:33:48 +0800
Subject: [PATCH 22/22] Update change-password.controller.js

modify "changed" to "change"
---
 .../js/layout/change-password/change-password.controller.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/resources/js/layout/change-password/change-password.controller.js b/static/resources/js/layout/change-password/change-password.controller.js
index 69897052d..b4d07c5d8 100644
--- a/static/resources/js/layout/change-password/change-password.controller.js
+++ b/static/resources/js/layout/change-password/change-password.controller.js
@@ -76,7 +76,7 @@
 
       var message;
       $scope.$emit('modalTitle', $filter('tr')('error'));
-      console.log('Failed to changed password:' + data);
+      console.log('Failed to change password:' + data);
       if(data == 'old_password_is_not_correct') {
         message = $filter('tr')('old_password_is_incorrect');
       }else{