models/issues/review.go

@@ -742,9 +742,17 @@ func RemoveReviewRequest(issue *Issue, reviewer, doer *user_model.User) (*Commen
 	if err != nil {
 		return nil, err
 	} else if official {
-		if err := restoreLatestOfficialReview(ctx, issue.ID, reviewer.ID); err != nil {
+		// recalculate the latest official review for reviewer
+		review, err := GetReviewByIssueIDAndUserID(ctx, issue.ID, reviewer.ID)
+		if err != nil && !IsErrReviewNotExist(err) {
 			return nil, err
 		}
+
+		if review != nil {
+			if _, err := db.Exec(ctx, "UPDATE `review` SET official=? WHERE id=?", true, review.ID); err != nil {
+				return nil, err
+			}
+		}
 	}
 
 	comment, err := CreateCommentCtx(ctx, &CreateCommentOptions{
@@ -762,22 +770,6 @@ func RemoveReviewRequest(issue *Issue, reviewer, doer *user_model.User) (*Commen
 	return comment, committer.Commit()
 }
 
-// Recalculate the latest official review for reviewer
-func restoreLatestOfficialReview(ctx context.Context, issueID, reviewerID int64) error {
-	review, err := GetReviewByIssueIDAndUserID(ctx, issueID, reviewerID)
-	if err != nil && !IsErrReviewNotExist(err) {
-		return err
-	}
-
-	if review != nil {
-		if _, err := db.Exec(ctx, "UPDATE `review` SET official=? WHERE id=?", true, review.ID); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 // AddTeamReviewRequest add a review request from one team
 func AddTeamReviewRequest(issue *Issue, reviewer *organization.Team, doer *user_model.User) (*Comment, error) {
 	ctx, committer, err := db.TxContext()
@@ -996,12 +988,6 @@ func DeleteReview(r *Review) error {
 		return err
 	}
 
-	if r.Official {
-		if err := restoreLatestOfficialReview(ctx, r.IssueID, r.ReviewerID); err != nil {
-			return err
-		}
-	}
-
 	return committer.Commit()
 }
 

models/issues/review_test.go

@@ -201,38 +201,3 @@ func TestDismissReview(t *testing.T) {
 	assert.False(t, requestReviewExample.Dismissed)
 	assert.True(t, approveReviewExample.Dismissed)
 }
-
-func TestDeleteReview(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-
-	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
-	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
-
-	review1, err := issues_model.CreateReview(db.DefaultContext, issues_model.CreateReviewOptions{
-		Content:  "Official rejection",
-		Type:     issues_model.ReviewTypeReject,
-		Official: false,
-		Issue:    issue,
-		Reviewer: user,
-	})
-	assert.NoError(t, err)
-
-	review2, err := issues_model.CreateReview(db.DefaultContext, issues_model.CreateReviewOptions{
-		Content:  "Official approval",
-		Type:     issues_model.ReviewTypeApprove,
-		Official: true,
-		Issue:    issue,
-		Reviewer: user,
-	})
-	assert.NoError(t, err)
-
-	assert.NoError(t, issues_model.DeleteReview(review2))
-
-	_, err = issues_model.GetReviewByID(db.DefaultContext, review2.ID)
-	assert.Error(t, err)
-	assert.True(t, issues_model.IsErrReviewNotExist(err), "IsErrReviewNotExist")
-
-	review1, err = issues_model.GetReviewByID(db.DefaultContext, review1.ID)
-	assert.NoError(t, err)
-	assert.True(t, review1.Official)
-}

options/locale/locale_en-US.ini

@@ -497,7 +497,6 @@ team_not_exist = The team does not exist.
 last_org_owner = You cannot remove the last user from the 'owners' team. There must be at least one owner for an organization.
 cannot_add_org_to_team = An organization cannot be added as a team member.
 duplicate_invite_to_team = The user was already invited as a team member.
-organization_leave_success = You have successfully left the organization %s.
 
 invalid_ssh_key = Can not verify your SSH key: %s
 invalid_gpg_key = Can not verify your GPG key: %s

routers/api/v1/api.go

@@ -1042,7 +1042,7 @@ func Routes(ctx gocontext.Context) *web.Route {
 					m.Get("/blobs/{sha}", repo.GetBlob)
 					m.Get("/tags/{sha}", repo.GetAnnotatedTag)
 					m.Get("/notes/{sha}", repo.GetNote)
-				}, context.ReferencesGitRepo(true), reqRepoReader(unit.TypeCode))
+				}, context.ReferencesGitRepo(), reqRepoReader(unit.TypeCode))
 				m.Post("/diffpatch", reqRepoWriter(unit.TypeCode), reqToken(), bind(api.ApplyDiffPatchFileOptions{}), repo.ApplyDiffPatch)
 				m.Group("/contents", func() {
 					m.Get("", repo.GetContentsList)

routers/web/org/members.go

@@ -108,21 +108,14 @@ func MembersAction(ctx *context.Context) {
 		}
 	case "leave":
 		err = models.RemoveOrgUser(org.ID, ctx.Doer.ID)
-		if err == nil {
+		if organization.IsErrLastOrgOwner(err) {
-			ctx.Flash.Success(ctx.Tr("form.organization_leave_success", org.DisplayName()))
-			ctx.JSON(http.StatusOK, map[string]interface{}{
-				"redirect": "", // keep the user stay on current page, in case they want to do other operations.
-			})
-		} else if organization.IsErrLastOrgOwner(err) {
 			ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
 			ctx.JSON(http.StatusOK, map[string]interface{}{
 				"redirect": ctx.Org.OrgLink + "/members",
 			})
-		} else {
-			log.Error("RemoveOrgUser(%d,%d): %v", org.ID, ctx.Doer.ID, err)
-		}
 			return
 		}
+	}
 
 	if err != nil {
 		log.Error("Action(%s): %v", ctx.Params(":action"), err)

templates/user/settings/organization.tmpl

@@ -17,13 +17,9 @@
 					{{range .Orgs}}
 					<div class="item">
 						<div class="right floated content">
-							<form>
+							<form method="post" action="{{.OrganisationLink}}/members/action/leave">
 								{{$.CsrfTokenHtml}}
-								<button class="ui red button delete-button" data-modal-id="leave-organization"
+								<button type="submit" class="ui primary small button" name="uid" value="{{.ID}}">{{$.locale.Tr "org.members.leave"}}</button>
-												data-url="{{.OrganisationLink}}/members/action/leave" data-datauid="{{$.SignedUser.ID}}"
-												data-name="{{$.SignedUser.DisplayName}}"
-												data-data-organization-name="{{.DisplayName}}">{{$.locale.Tr "org.members.leave"}}
-								</button>
 							</form>
 						</div>
 						{{avatar . 28 "mini"}}
@@ -40,14 +36,4 @@
 		</div>
 	</div>
 </div>
-<div class="ui small basic delete modal" id="leave-organization">
-	<div class="ui icon header">
-		{{svg "octicon-x" 16 "close inside"}}
-		{{$.locale.Tr "org.members.leave"}}
-	</div>
-	<div class="content">
-		<p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
-	</div>
-	{{template "base/delete_modal_actions" .}}
-</div>
 {{template "base/footer" .}}

web_src/js/features/repo-projects.js

@@ -200,7 +200,7 @@ function getRelativeColor(color) {
 }
 
 function rgbToHex(rgb) {
-  rgb = rgb.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+).*\)$/);
+  rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
   return `#${hex(rgb[1])}${hex(rgb[2])}${hex(rgb[3])}`;
 }