aboutsummaryrefslogtreecommitdiffstats
path: root/models/issues/review.go
diff options
context:
space:
mode:
authorwilliam-allspice <william@allspice.io>2024-09-06 01:40:02 -0500
committerGitHub <noreply@github.com>2024-09-06 06:40:02 +0000
commite9c64f41a6895806e578fc6c9746044bdd31c563 (patch)
tree12ad9d73ad1efe89938751025ccc4fc9edee0782 /models/issues/review.go
parentbf7ae0429cdf236510aa6702e499878bc2345a6e (diff)
downloadgitea-e9c64f41a6895806e578fc6c9746044bdd31c563.tar.gz
gitea-e9c64f41a6895806e578fc6c9746044bdd31c563.zip
Distinguish official vs non-official reviews, add tool tips, and upgr… (#31924)
This Pull Request is a follow up to https://github.com/go-gitea/gitea/pull/31886: 1. Adds a UI indicator between official (green) and unofficial (grey) approved pull requests on the Pull Request page (as suggested by @kdumontnu ) 2. Adds tooltips adding clarity to the type and status of a review on the Pull Request page (as suggested by @kdumontnu) 3. Updates text adding more clarity to required approvals (as suggested by @kdumontnu) 4. Updates text on the branch settings page explaining what branch approval limitations (as suggested by @yp05327) Official approval: <img width="376" alt="Screenshot 2024-08-26 at 1 03 52 PM" src="https://github.com/user-attachments/assets/500f083d-bfc0-45c5-82b7-b98e20495696"> Unofficial approval: <img width="442" alt="Screenshot 2024-08-26 at 12 53 15 PM" src="https://github.com/user-attachments/assets/e8c565ff-5886-4ce1-8b79-a0fa26c282f7"> Rejected approval: <img width="452" alt="Screenshot 2024-08-26 at 12 53 06 PM" src="https://github.com/user-attachments/assets/aebc0e2f-7052-4dea-8098-7caa0db86617"> Stale approval: <img width="546" alt="Screenshot 2024-08-26 at 1 07 59 PM" src="https://github.com/user-attachments/assets/da599ff3-e35c-4fa3-8141-ed80b738dd77"> Requested review tooltip: <img width="434" alt="Screenshot 2024-08-26 at 12 53 22 PM" src="https://github.com/user-attachments/assets/460d163e-8724-43b6-8760-34b285da8fe2"> Updated text for approvals: <img width="991" alt="Screenshot 2024-08-26 at 12 54 00 PM" src="https://github.com/user-attachments/assets/ab3ff012-9742-4c1b-933d-21addcb89f2c"> Updated text for allowlisted/whitelisted approvals: <img width="990" alt="Screenshot 2024-08-26 at 1 01 40 PM" src="https://github.com/user-attachments/assets/1a5bae61-d9e0-4d96-b86f-92610b0940d1"> Protected branch settings text: <img width="1022" alt="Screenshot 2024-08-26 at 1 01 14 PM" src="https://github.com/user-attachments/assets/892ce208-e1c2-41f7-8fec-46d5a0e7e776"> Comments list: <img width="1048" alt="Screenshot 2024-08-28 at 9 25 31 AM" src="https://github.com/user-attachments/assets/9c5c00c5-06cf-43b3-b413-4f7f673609b2"> --------- Co-authored-by: Kyle D. <kdumontnu@gmail.com>
Diffstat (limited to 'models/issues/review.go')
-rw-r--r--models/issues/review.go25
1 files changed, 25 insertions, 0 deletions
diff --git a/models/issues/review.go b/models/issues/review.go
index ca6fd6035b..9a08e265ff 100644
--- a/models/issues/review.go
+++ b/models/issues/review.go
@@ -214,9 +214,13 @@ func (r *Review) LoadAttributes(ctx context.Context) (err error) {
return err
}
+// HTMLTypeColorName returns the color used in the ui indicating the review
func (r *Review) HTMLTypeColorName() string {
switch r.Type {
case ReviewTypeApprove:
+ if !r.Official {
+ return "grey"
+ }
if r.Stale {
return "yellow"
}
@@ -231,6 +235,27 @@ func (r *Review) HTMLTypeColorName() string {
return "grey"
}
+// TooltipContent returns the locale string describing the review type
+func (r *Review) TooltipContent() string {
+ switch r.Type {
+ case ReviewTypeApprove:
+ if r.Stale {
+ return "repo.issues.review.stale"
+ }
+ if !r.Official {
+ return "repo.issues.review.unofficial"
+ }
+ return "repo.issues.review.official"
+ case ReviewTypeComment:
+ return "repo.issues.review.comment"
+ case ReviewTypeReject:
+ return "repo.issues.review.rejected"
+ case ReviewTypeRequest:
+ return "repo.issues.review.requested"
+ }
+ return ""
+}
+
// GetReviewByID returns the review by the given ID
func GetReviewByID(ctx context.Context, id int64) (*Review, error) {
review := new(Review)