FIX: Remember sort and topic-search when switching users (#98)
This commit is contained in:
parent
98bc01be16
commit
141ef6a882
|
@ -14,6 +14,21 @@ export default Controller.extend({
|
|||
filterName: "",
|
||||
filter: "",
|
||||
|
||||
@discourseComputed("router.currentRoute.queryParams.order")
|
||||
order(order) {
|
||||
return order || "";
|
||||
},
|
||||
|
||||
@discourseComputed("router.currentRoute.queryParams.ascending")
|
||||
ascending(ascending) {
|
||||
return ascending || false;
|
||||
},
|
||||
|
||||
@discourseComputed("router.currentRoute.queryParams.q")
|
||||
q(q) {
|
||||
return q || "";
|
||||
},
|
||||
|
||||
@discourseComputed("site.mobileView")
|
||||
isDesktop(mobileView) {
|
||||
return !mobileView;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{{#if show-avatar}}
|
||||
{{#link-to "group.assigned.show" filter.username_lower}}
|
||||
{{#link-to "group.assigned.show" filter.username_lower (query-params order=order ascending=ascending q=q)}}
|
||||
<div class="assign-image">
|
||||
<a href={{filter.userPath}} data-user-card={{filter.username}}>{{avatar filter imageSize="large"}}</a>
|
||||
</div>
|
||||
|
@ -14,7 +14,7 @@
|
|||
</div>
|
||||
{{/link-to}}
|
||||
{{else}}
|
||||
{{#link-to "group.assigned.show" filter}}
|
||||
{{#link-to "group.assigned.show" filter (query-params order=order ascending=ascending q=q)}}
|
||||
<div class="assign-everyone">
|
||||
{{i18n 'discourse_assign.group_everyone'}}
|
||||
</div>
|
||||
|
|
|
@ -12,9 +12,22 @@
|
|||
</div>
|
||||
{{/if}}
|
||||
{{#load-more selector=".activity-nav li" action=(action "loadMore")}}
|
||||
{{group-assigned-filter show-avatar=false filter="everyone" routeType=route_type assignmentCount=group.assignment_count}}
|
||||
{{group-assigned-filter
|
||||
show-avatar=false
|
||||
filter="everyone"
|
||||
routeType=route_type
|
||||
assignmentCount=group.assignment_count
|
||||
q=q
|
||||
ascending=ascending
|
||||
order=order}}
|
||||
{{#each members as |member|}}
|
||||
{{group-assigned-filter show-avatar=true filter=member routeType=route_type}}
|
||||
{{group-assigned-filter
|
||||
show-avatar=true
|
||||
filter=member
|
||||
routeType=route_type
|
||||
q=q
|
||||
ascending=ascending
|
||||
order=order}}
|
||||
{{/each}}
|
||||
{{conditional-loading-spinner condition=loading}}
|
||||
{{/load-more}}
|
||||
|
|
Loading…
Reference in New Issue