Skip to content

Commit cb6c362

Browse files
moore3071carols10cents
moore3071
authored and
carols10cents
committed
changed recently updated to recent updates to match recent downloads
1 parent 543583d commit cb6c362

File tree

17 files changed

+34
-34
lines changed

17 files changed

+34
-34
lines changed

‎app/controllers/category/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ export default Controller.extend(PaginationMixin, {
1919
return 'All-Time Downloads';
2020
} else if (this.sort === 'alpha') {
2121
return 'Alphabetical';
22-
} else if (this.get('sort') === 'recently-updated') {
23-
return 'Recently Updated';
22+
} else if (this.get('sort') === 'recent-updates') {
23+
return 'Recent Updates';
2424
} else {
2525
return 'Recent Downloads';
2626
}

‎app/controllers/crates.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ export default Controller.extend(PaginationMixin, {
1919
return 'All-Time Downloads';
2020
} else if (this.sort === 'recent-downloads') {
2121
return 'Recent Downloads';
22-
} else if (this.get('sort') === 'recently-updated') {
23-
return 'Recently Updated';
22+
} else if (this.get('sort') === 'recent-updates') {
23+
return 'Recent Updates';
2424
} else {
2525
return 'Alphabetical';
2626
}

‎app/controllers/keyword/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export default Controller.extend(PaginationMixin, {
1717
return 'All-Time Downloads';
1818
} else if (this.sort === 'alpha') {
1919
return 'Alphabetical';
20-
} else if (this.get('sort') === 'recently-updated') {
21-
return 'Recently Updated';
20+
} else if (this.get('sort') === 'recent-updates') {
21+
return 'Recent Updates';
2222
} else {
2323
return 'Recent Downloads';
2424
}

‎app/controllers/me/crates.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ export default Controller.extend(PaginationMixin, {
1919
return 'All-Time Downloads';
2020
} else if (this.sort === 'recent-downloads') {
2121
return 'Recent Downloads';
22-
} else if (this.get('sort') === 'recently-updated') {
23-
return 'Recently Updated';
22+
} else if (this.get('sort') === 'recent-updates') {
23+
return 'Recent Updates';
2424
} else {
2525
return 'Alphabetical';
2626
}

‎app/controllers/search.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ export default Controller.extend(PaginationMixin, {
3131
return 'All-Time Downloads';
3232
} else if (this.sort === 'recent-downloads') {
3333
return 'Recent Downloads';
34-
} else if (this.get('sort') === 'recently-updated') {
35-
return 'Recently Updated';
34+
} else if (this.get('sort') === 'recent-updates') {
35+
return 'Recent Updates';
3636
} else {
3737
return 'Relevance';
3838
}

‎app/controllers/team.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export default Controller.extend(PaginationMixin, {
1717
return 'All-Time Downloads';
1818
} else if (this.sort === 'recent-downloads') {
1919
return 'Recent Downloads';
20-
} else if (this.get('sort') === 'recently-updated') {
21-
return 'Recently Updated';
20+
} else if (this.get('sort') === 'recent-updates') {
21+
return 'Recent Updates';
2222
} else {
2323
return 'Alphabetical';
2424
}

‎app/controllers/user.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export default Controller.extend(PaginationMixin, {
1818
return 'All-Time Downloads';
1919
} else if (this.sort === 'recent-downloads') {
2020
return 'Recent Downloads';
21-
} else if (this.get('sort') === 'recently-updated') {
22-
return 'Recently Updated';
21+
} else if (this.get('sort') === 'recent-updates') {
22+
return 'Recent Updates';
2323
} else {
2424
return 'Alphabetical';
2525
}

‎app/templates/category/index.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
{{/link-to}}
7171
</li>
7272
<li>
73-
{{#link-to (query-params sort="recently-updated")}}
74-
Recently Updated
73+
{{#link-to (query-params sort="recent-updates")}}
74+
Recent Updates
7575
{{/link-to}}
7676
</li>
7777
{{/rl-dropdown}}

‎app/templates/crates.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
{{/link-to}}
6262
</li>
6363
<li>
64-
{{#link-to (query-params page=1 sort="recently-updated")}}
65-
Recently Updated
64+
{{#link-to (query-params page=1 sort="recent-updates")}}
65+
Recent Updates
6666
{{/link-to}}
6767
</li>
6868
{{/rl-dropdown}}

‎app/templates/keyword/index.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
{{/link-to}}
4242
</li>
4343
<li>
44-
{{#link-to (query-params sort="recently-updated")}}
45-
Recently Updated
44+
{{#link-to (query-params sort="recent-updates")}}
45+
Recent Updates
4646
{{/link-to}}
4747
</li>
4848
{{/rl-dropdown}}

‎app/templates/me/crates.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
{{/link-to}}
4343
</li>
4444
<li>
45-
{{#link-to (query-params sort="recently-updated")}}
46-
Recently Updated
45+
{{#link-to (query-params sort="recent-updates")}}
46+
Recent Updates
4747
{{/link-to}}
4848
</li>
4949
{{/rl-dropdown}}

‎app/templates/search.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
{{/link-to}}
5454
</li>
5555
<li>
56-
{{#link-to (query-params page=1 sort="recently-updated")}}
57-
Recently Updated
56+
{{#link-to (query-params page=1 sort="recent-updates")}}
57+
Recent Updates
5858
{{/link-to}}
5959
</li>
6060
{{/rl-dropdown}}

‎app/templates/team.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
{{/link-to}}
5757
</li>
5858
<li>
59-
{{#link-to (query-params sort="recently-updated")}}
60-
Recently Updated
59+
{{#link-to (query-params sort="recent-updates")}}
60+
Recent Updates
6161
{{/link-to}}
6262
</li>
6363
{{/rl-dropdown}}

‎app/templates/user.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
{{/link-to}}
4848
</li>
4949
<li>
50-
{{#link-to (query-params sort="recently-updated")}}
51-
Recently Updated
50+
{{#link-to (query-params sort="recent-updates")}}
51+
Recent Updates
5252
{{/link-to}}
5353
</li>
5454
{{/rl-dropdown}}

‎src/controllers/krate/search.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ pub fn search(req: &mut dyn Request) -> CargoResult<Response> {
143143
query = query.then_order_by(crates::downloads.desc())
144144
} else if sort == "recent-downloads" {
145145
query = query.then_order_by(recent_crate_downloads::downloads.desc().nulls_last())
146-
} else if sort == "recently-updated" {
146+
} else if sort == "recent-updates" {
147147
query = query.order(crates::updated_at.desc());
148148
} else {
149149
query = query.then_order_by(crates::name.asc())

‎src/tests/krate.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,8 @@ fn index_sorting() {
362362
assert_eq!(json.crates[2].name, "bar_sort");
363363
assert_eq!(json.crates[3].name, "other_sort");
364364

365-
//Sort by recently-updated
366-
let mut response = ok_resp!(middle.call(req.with_query("sort=recently-updated"),));
365+
//Sort by recent-updates
366+
let mut response = ok_resp!(middle.call(req.with_query("sort=recent-updates"),));
367367
let json: CrateList = ::json(&mut response);
368368
assert_eq!(json.meta.total, 4);
369369
assert_eq!(json.crates[0].name, "other_sort");
@@ -477,8 +477,8 @@ fn exact_match_on_queries_with_sort() {
477477
assert_eq!(json.crates[1].name, "foo_sort");
478478
assert_eq!(json.crates[2].name, "baz_sort");
479479

480-
//Sort by recently-updated
481-
let mut response = ok_resp!(middle.call(req.with_query("q=bar_sort&sort=recently-updated"),));
480+
//Sort by recent-updates
481+
let mut response = ok_resp!(middle.call(req.with_query("q=bar_sort&sort=recent-updates"),));
482482
let json: CrateList = ::json(&mut response);
483483
assert_eq!(json.meta.total, 3);
484484
assert_eq!(json.crates[0].name, "baz_sort");

‎tests/acceptance/search-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module('Acceptance | search', function(hooks) {
3636
assert.dom('[data-test-search-nav]').hasText('Displaying 1-8 of 8 total results');
3737
assert
3838
.dom('[data-test-search-sort]')
39-
.hasText('Sort by Relevance Relevance All-Time Downloads Recent Downloads');
39+
.hasText('Sort by Relevance Relevance All-Time Downloads Recent Downloads Recent Updates');
4040
assert.dom('[data-test-crate-row="0"] [data-test-crate-link]').hasText('kinetic-rust');
4141
assert.dom('[data-test-crate-row="0"] [data-test-version-badge]').hasAttribute('alt', '0.0.16');
4242

0 commit comments

Comments
 (0)