Merge pull request 'fix search all citask when everytime' (#77) from fix-cloudbrain into master

models/cloudbrain.go

@@ -179,19 +179,19 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*Cloudbrain, int64, error) {
 
 	var cond = builder.NewCond()
 	if opts.RepoID > 0 {
-		cond.And(
+		cond = cond.And(
 			builder.Eq{"cloudbrain.repo_id": opts.RepoID},
 		)
 	}
 
 	if opts.UserID > 0 {
-		cond.And(
+		cond = cond.And(
 			builder.Eq{"cloudbrain.user_id": opts.UserID},
 		)
 	}
 
 	if (opts.JobID) > 0 {
-		cond.And(
+		cond = cond.And(
 			builder.Eq{"cloudbrain.job_id": opts.JobID},
 		)
 	}
@@ -208,7 +208,7 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*Cloudbrain, int64, error) {
 	// }
 
 	if len(opts.CloudbrainIDs) > 0 {
-		cond.And(builder.In("cloudbrain.id", opts.CloudbrainIDs))
+		cond = cond.And(builder.In("cloudbrain.id", opts.CloudbrainIDs))
 	}
 
 	count, err := sess.Where(cond).Count(new(Cloudbrain))
@@ -228,7 +228,7 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*Cloudbrain, int64, error) {
 
 	sess.OrderBy("cloudbrain.created_unix DESC")
 	cloudbrains := make([]*Cloudbrain, 0, setting.UI.IssuePagingNum)
-	if err := sess.Find(&cloudbrains); err != nil {
+	if err := sess.Where(cond).Find(&cloudbrains); err != nil {
 		return nil, 0, fmt.Errorf("Find: %v", err)
 	}
 	sess.Close()