github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-24 00:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Rename Priority to score for sorting. (#9846)

Browse Source
This commit is contained in:
Roman Rizzi 2020-05-27 12:50:28 -03:00 committed by GitHub
parent 488f8d914a
commit 461df7d050
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/discourse/app/controllers/review-index.js
View File

@ -57,14 +57,12 @@ export default Controller.extend({
@discourseComputed @discourseComputed
sortOrders() { sortOrders() {
return ["priority", "priority_asc", "created_at", "created_at_asc"].map( return ["score", "score_asc", "created_at", "created_at_asc"].map(order => {
order => { return {
return { id: order,
id: order, name: I18n.t(`review.filters.orders.${order}`)
name: I18n.t(`review.filters.orders.${order}`) };
}; });
}
);
}, },
@discourseComputed @discourseComputed
@ -129,14 +127,14 @@ export default Controller.extend({
priorityStatuses.includes(nextStatus) && priorityStatuses.includes(nextStatus) &&
nextOrder === "created_at" nextOrder === "created_at"
) { ) {
nextOrder = "priority"; nextOrder = "score";
} }
if ( if (
priorityStatuses.includes(currentStatus) && priorityStatuses.includes(currentStatus) &&
currentOrder === "priority" && currentOrder === "score" &&
createdAtStatuses.includes(nextStatus) && createdAtStatuses.includes(nextStatus) &&
nextOrder === "priority" nextOrder === "score"
) { ) {
nextOrder = "created_at"; nextOrder = "created_at";
} }

2
app/assets/javascripts/discourse/app/routes/review-index.js
View File

@ -7,7 +7,7 @@ export default DiscourseRoute.extend({
if (params.status === "reviewed" || params.status === "all") { if (params.status === "reviewed" || params.status === "all") {
params.sort_order = "created_at"; params.sort_order = "created_at";
} else { } else {
params.sort_order = "priority"; params.sort_order = "score";
} }
} }

2
app/models/reviewable.rb
View File

@ -450,7 +450,7 @@ class Reviewable < ActiveRecord::Base
min_score = Reviewable.min_score_for_priority(priority) min_score = Reviewable.min_score_for_priority(priority)
order = case sort_order order = case sort_order
when 'priority_asc' when 'score_asc'
'reviewables.score ASC, reviewables.created_at DESC' 'reviewables.score ASC, reviewables.created_at DESC'
when 'created_at' when 'created_at'
'reviewables.created_at DESC, reviewables.score DESC' 'reviewables.created_at DESC, reviewables.score DESC'

4
config/locales/client.en.yml
View File

@ -512,8 +512,8 @@ en:
status: "Status" status: "Status"
category: "Category" category: "Category"
orders: orders:
priority: "Priority" score: "Score"
priority_asc: "Priority (reverse)" score_asc: "Score (reverse)"
created_at: "Created At" created_at: "Created At"
created_at_asc: "Created At (reverse)" created_at_asc: "Created At (reverse)"

4
spec/models/reviewable_spec.rb
View File

@ -159,11 +159,11 @@ RSpec.describe Reviewable, type: :model do
r0 = Fabricate(:reviewable, score: 100, created_at: 3.months.ago) r0 = Fabricate(:reviewable, score: 100, created_at: 3.months.ago)
r1 = Fabricate(:reviewable, score: 999, created_at: 1.month.ago) r1 = Fabricate(:reviewable, score: 999, created_at: 1.month.ago)
list = Reviewable.list_for(user, sort_order: 'priority') list = Reviewable.list_for(user, sort_order: 'score')
expect(list[0].id).to eq(r1.id) expect(list[0].id).to eq(r1.id)
expect(list[1].id).to eq(r0.id) expect(list[1].id).to eq(r0.id)
list = Reviewable.list_for(user, sort_order: 'priority_asc') list = Reviewable.list_for(user, sort_order: 'score_asc')
expect(list[0].id).to eq(r0.id) expect(list[0].id).to eq(r0.id)
expect(list[1].id).to eq(r1.id) expect(list[1].id).to eq(r1.id)