fix #1558

diff --git a/models/org.go b/models/org.go
index dfd720fadee6555c184cc3f47d384b8d5f5b92d7..ac458c78d5af4679ce46255ba800a93b6b520ced 100644 (file)
--- a/models/org.go
+++ b/models/org.go
@@ -212,7 +212,6 @@ func GetOrganizations(num, offset int) ([]*User, error) {
        return orgs, err
 }
 
-// TODO: need some kind of mechanism to record failure.
 // DeleteOrganization completely and permanently deletes everything of organization.
 func DeleteOrganization(org *User) (err error) {
        if err := DeleteUser(org); err != nil {
@@ -220,23 +219,23 @@ func DeleteOrganization(org *User) (err error) {
        }
 
        sess := x.NewSession()
-       defer sess.Close()
+       defer sessionRelease(sess)
        if err = sess.Begin(); err != nil {
                return err
        }
 
-       if _, err = sess.Delete(&Team{OrgID: org.Id}); err != nil {
-               sess.Rollback()
-               return err
+       if err = deleteBeans(sess,
+               &Team{OrgID: org.Id},
+               &OrgUser{OrgID: org.Id},
+               &TeamUser{OrgID: org.Id},
+       ); err != nil {
+               return fmt.Errorf("deleteBeans: %v", err)
        }
-       if _, err = sess.Delete(&OrgUser{OrgID: org.Id}); err != nil {
-               sess.Rollback()
-               return err
-       }
-       if _, err = sess.Delete(&TeamUser{OrgID: org.Id}); err != nil {
-               sess.Rollback()
-               return err
+
+       if err = deleteUser(sess, org); err != nil {
+               return fmt.Errorf("deleteUser: %v", err)
        }
+
        return sess.Commit()
 }
 

diff --git a/models/repo.go b/models/repo.go
index d0fa7c8fc660ae7204d6636b5176e4f2ddfe9614..2835b6f9e3c7b52c26cd2d1094ff6f7f0b5b27d2 100644 (file)
--- a/models/repo.go
+++ b/models/repo.go
@@ -1190,9 +1190,13 @@ func GetRecentUpdatedRepositories(page int) (repos []*Repository, err error) {
                Where("is_private=?", false).Limit(setting.ExplorePagingNum).Desc("updated").Find(&repos)
 }
 
+func getRepositoryCount(e Engine, u *User) (int64, error) {
+       return x.Count(&Repository{OwnerID: u.Id})
+}
+
 // GetRepositoryCount returns the total number of repositories of user.
 func GetRepositoryCount(u *User) (int64, error) {
-       return x.Count(&Repository{OwnerID: u.Id})
+       return getRepositoryCount(x, u)
 }
 
 type SearchOption struct {

diff --git a/models/user.go b/models/user.go
index 423b30f16ec704b90d7a4995da8d801df625a0d7..beea155ae2369db3924c4e97124d03e35f0dbc6f 100644 (file)
--- a/models/user.go
+++ b/models/user.go
@@ -284,9 +284,13 @@ func (u *User) IsPublicMember(orgId int64) bool {
        return IsPublicMembership(orgId, u.Id)
 }
 
+func (u *User) getOrganizationCount(e Engine) (int64, error) {
+       return e.Where("uid=?", u.Id).Count(new(OrgUser))
+}
+
 // GetOrganizationCount returns count of membership of organization of user.
 func (u *User) GetOrganizationCount() (int64, error) {
-       return x.Where("uid=?", u.Id).Count(new(OrgUser))
+       return u.getOrganizationCount(x)
 }
 
 // GetRepositories returns all repositories that user owns, including private repositories.
@@ -525,8 +529,8 @@ func UpdateUser(u *User) error {
        return updateUser(x, u)
 }
 
-// DeleteBeans deletes all given beans, beans should contain delete conditions.
-func DeleteBeans(e Engine, beans ...interface{}) (err error) {
+// deleteBeans deletes all given beans, beans should contain delete conditions.
+func deleteBeans(e Engine, beans ...interface{}) (err error) {
        for i := range beans {
                if _, err = e.Delete(beans[i]); err != nil {
                        return err
@@ -536,14 +540,12 @@ func DeleteBeans(e Engine, beans ...interface{}) (err error) {
 }
 
 // FIXME: need some kind of mechanism to record failure. HINT: system notice
-// DeleteUser completely and permanently deletes everything of a user,
-// but issues/comments/pulls will be kept and shown as someone has been deleted.
-func DeleteUser(u *User) error {
+func deleteUser(e *xorm.Session, u *User) error {
        // Note: A user owns any repository or belongs to any organization
        //      cannot perform delete operation.
 
        // Check ownership of repository.
-       count, err := GetRepositoryCount(u)
+       count, err := getRepositoryCount(e, u)
        if err != nil {
                return fmt.Errorf("GetRepositoryCount: %v", err)
        } else if count > 0 {
@@ -551,26 +553,20 @@ func DeleteUser(u *User) error {
        }
 
        // Check membership of organization.
-       count, err = u.GetOrganizationCount()
+       count, err = u.getOrganizationCount(e)
        if err != nil {
                return fmt.Errorf("GetOrganizationCount: %v", err)
        } else if count > 0 {
                return ErrUserHasOrgs{UID: u.Id}
        }
 
-       sess := x.NewSession()
-       defer sessionRelease(sess)
-       if err = sess.Begin(); err != nil {
-               return err
-       }
-
        // ***** START: Watch *****
        watches := make([]*Watch, 0, 10)
-       if err = x.Find(&watches, &Watch{UserID: u.Id}); err != nil {
+       if err = e.Find(&watches, &Watch{UserID: u.Id}); err != nil {
                return fmt.Errorf("get all watches: %v", err)
        }
        for i := range watches {
-               if _, err = sess.Exec("UPDATE `repository` SET num_watches=num_watches-1 WHERE id=?", watches[i].RepoID); err != nil {
+               if _, err = e.Exec("UPDATE `repository` SET num_watches=num_watches-1 WHERE id=?", watches[i].RepoID); err != nil {
                        return fmt.Errorf("decrease repository watch number[%d]: %v", watches[i].RepoID, err)
                }
        }
@@ -578,11 +574,11 @@ func DeleteUser(u *User) error {
 
        // ***** START: Star *****
        stars := make([]*Star, 0, 10)
-       if err = x.Find(&stars, &Star{UID: u.Id}); err != nil {
+       if err = e.Find(&stars, &Star{UID: u.Id}); err != nil {
                return fmt.Errorf("get all stars: %v", err)
        }
        for i := range stars {
-               if _, err = sess.Exec("UPDATE `repository` SET num_stars=num_stars-1 WHERE id=?", stars[i].RepoID); err != nil {
+               if _, err = e.Exec("UPDATE `repository` SET num_stars=num_stars-1 WHERE id=?", stars[i].RepoID); err != nil {
                        return fmt.Errorf("decrease repository star number[%d]: %v", stars[i].RepoID, err)
                }
        }
@@ -590,17 +586,17 @@ func DeleteUser(u *User) error {
 
        // ***** START: Follow *****
        followers := make([]*Follow, 0, 10)
-       if err = x.Find(&followers, &Follow{UserID: u.Id}); err != nil {
+       if err = e.Find(&followers, &Follow{UserID: u.Id}); err != nil {
                return fmt.Errorf("get all followers: %v", err)
        }
        for i := range followers {
-               if _, err = sess.Exec("UPDATE `user` SET num_followers=num_followers-1 WHERE id=?", followers[i].UserID); err != nil {
+               if _, err = e.Exec("UPDATE `user` SET num_followers=num_followers-1 WHERE id=?", followers[i].UserID); err != nil {
                        return fmt.Errorf("decrease user follower number[%d]: %v", followers[i].UserID, err)
                }
        }
        // ***** END: Follow *****
 
-       if err = DeleteBeans(sess,
+       if err = deleteBeans(e,
                &Oauth2{Uid: u.Id},
                &AccessToken{UID: u.Id},
                &Collaboration{UserID: u.Id},
@@ -612,34 +608,30 @@ func DeleteUser(u *User) error {
                &IssueUser{UID: u.Id},
                &EmailAddress{Uid: u.Id},
        ); err != nil {
-               return fmt.Errorf("DeleteBeans: %v", err)
+               return fmt.Errorf("deleteUser: %v", err)
        }
 
        // ***** START: PublicKey *****
        keys := make([]*PublicKey, 0, 10)
-       if err = sess.Find(&keys, &PublicKey{OwnerID: u.Id}); err != nil {
+       if err = e.Find(&keys, &PublicKey{OwnerID: u.Id}); err != nil {
                return fmt.Errorf("get all public keys: %v", err)
        }
        for _, key := range keys {
-               if err = deletePublicKey(sess, key.ID); err != nil {
+               if err = deletePublicKey(e, key.ID); err != nil {
                        return fmt.Errorf("deletePublicKey: %v", err)
                }
        }
        // ***** END: PublicKey *****
 
        // Clear assignee.
-       if _, err = sess.Exec("UPDATE `issue` SET assignee_id=0 WHERE assignee_id=?", u.Id); err != nil {
+       if _, err = e.Exec("UPDATE `issue` SET assignee_id=0 WHERE assignee_id=?", u.Id); err != nil {
                return fmt.Errorf("clear assignee: %v", err)
        }
 
-       if _, err = sess.Id(u.Id).Delete(new(User)); err != nil {
+       if _, err = e.Id(u.Id).Delete(new(User)); err != nil {
                return fmt.Errorf("Delete: %v", err)
        }
 
-       if err = sess.Commit(); err != nil {
-               return fmt.Errorf("Commit: %v", err)
-       }
-
        // FIXME: system notice
        // Note: There are something just cannot be roll back,
        //      so just keep error logs of those operations.
@@ -651,6 +643,22 @@ func DeleteUser(u *User) error {
        return nil
 }
 
+// DeleteUser completely and permanently deletes everything of a user,
+// but issues/comments/pulls will be kept and shown as someone has been deleted.
+func DeleteUser(u *User) (err error) {
+       sess := x.NewSession()
+       defer sessionRelease(sess)
+       if err = sess.Begin(); err != nil {
+               return err
+       }
+
+       if err = deleteUser(sess, u); err != nil {
+               return fmt.Errorf("deleteUser: %v", err)
+       }
+
+       return sess.Commit()
+}
+
 // DeleteInactivateUsers deletes all inactivate users and email addresses.
 func DeleteInactivateUsers() (err error) {
        users := make([]*User, 0, 10)

diff --git a/public/config.codekit b/public/config.codekit
index 430de03f2a53d064947083c1f3d5eb032ee18403..63f5efa4d1cfd0a87376fc54fc06a5ed2b14c747 100644 (file)
--- a/public/config.codekit
+++ b/public/config.codekit
@@ -670,6 +670,17 @@
                "outputStyle": 1,
                "syntaxCheckerStyle": 1
                },
+       "\/ng\/js\/min\/gogs-min.js": {
+               "fileType": 64,
+               "ignore": 1,
+               "ignoreWasSetByUser": 0,
+               "inputAbbreviatedPath": "\/ng\/js\/min\/gogs-min.js",
+               "outputAbbreviatedPath": "\/ng\/js\/min\/min\/gogs-min-min.js",
+               "outputPathIsOutsideProject": 0,
+               "outputPathIsSetByUser": 0,
+               "outputStyle": 1,
+               "syntaxCheckerStyle": 1
+               },
        "\/ng\/js\/utils\/preview.js": {
                "fileType": 64,
                "ignore": 1,

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 329bc933110970d107cf91dd5b03f7e28689458c..b9cc98a2dcdc82d7a04faee15265863761377c7e 100644 (file)
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -198,7 +198,8 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) {
        }
 
        if strings.Contains(err.Error(), "Authentication failed") ||
-               strings.Contains(err.Error(), " not found") {
+               strings.Contains(err.Error(), " not found") ||
+               strings.Contains(err.Error(), "could not read Username") {
                ctx.Data["Err_Auth"] = true
                ctx.RenderWithErr(ctx.Tr("form.auth_failed", strings.Replace(err.Error(), ":"+form.AuthPassword+"@", ":<password>@", 1)), MIGRATE, &form)
                return