diff --git a/app/assets/javascripts/discourse/controllers/review-index.js.es6 b/app/assets/javascripts/discourse/controllers/review-index.js.es6 index 9c8f161d8de..8367b207747 100644 --- a/app/assets/javascripts/discourse/controllers/review-index.js.es6 +++ b/app/assets/javascripts/discourse/controllers/review-index.js.es6 @@ -2,7 +2,7 @@ import computed from "ember-addons/ember-computed-decorators"; export default Ember.Controller.extend({ queryParams: [ - "min_score", + "priority", "type", "status", "category_id", @@ -11,7 +11,7 @@ export default Ember.Controller.extend({ ], type: null, status: "pending", - min_score: null, + priority: "low", category_id: null, reviewables: null, topic_id: null, @@ -20,7 +20,7 @@ export default Ember.Controller.extend({ init(...args) { this._super(...args); - this.set("min_score", this.siteSettings.min_score_default_visibility); + this.set("priority", this.siteSettings.reviewable_default_visibility); this.set("filtersExpanded", !this.site.mobileView); }, @@ -34,6 +34,16 @@ export default Ember.Controller.extend({ }); }, + @computed + priorities() { + return ["low", "medium", "high"].map(priority => { + return { + id: priority, + name: I18n.t(`review.filters.priority.${priority}`) + }; + }); + }, + @computed statuses() { return [ @@ -71,15 +81,9 @@ export default Ember.Controller.extend({ }, refresh() { - // If filterScore is blank use the default - let filterScore = this.get("filterScore"); - if (!filterScore || filterScore.length === 0) { - filterScore = this.siteSettings.min_score_default_visibility; - } - this.setProperties({ type: this.get("filterType"), - min_score: filterScore, + priority: this.get("filterPriority"), status: this.get("filterStatus"), category_id: this.get("filterCategoryId"), username: this.get("filterUsername") diff --git a/app/assets/javascripts/discourse/helpers/format-score.js.es6 b/app/assets/javascripts/discourse/helpers/format-score.js.es6 deleted file mode 100644 index f3d184de0a6..00000000000 --- a/app/assets/javascripts/discourse/helpers/format-score.js.es6 +++ /dev/null @@ -1,5 +0,0 @@ -import { registerUnbound } from "discourse-common/lib/helpers"; - -registerUnbound("format-score", function(score) { - return I18n.toNumber(score || 0, { precision: 1 }); -}); diff --git a/app/assets/javascripts/discourse/routes/review-index.js.es6 b/app/assets/javascripts/discourse/routes/review-index.js.es6 index f925075d9a1..01ff4e588db 100644 --- a/app/assets/javascripts/discourse/routes/review-index.js.es6 +++ b/app/assets/javascripts/discourse/routes/review-index.js.es6 @@ -1,9 +1,5 @@ export default Discourse.Route.extend({ model(params) { - // `0` is a valid query param - if (params.min_score != null) { - params.min_score = params.min_score.toString(); - } return this.store.findAll("reviewable", params); }, @@ -22,8 +18,7 @@ export default Discourse.Route.extend({ filterStatus: meta.status, filterTopic: meta.topic_id, filterCategoryId: meta.category_id, - min_score: meta.min_score, - filterScore: meta.min_score, + filterPriority: meta.priority, reviewableTypes: meta.reviewable_types, filterUsername: meta.username }); diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs index 0876b8b3f85..dc1c908e55a 100644 --- a/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs +++ b/app/assets/javascripts/discourse/templates/components/reviewable-item.hbs @@ -1,7 +1,6 @@