discourse
/
discourse-assign
mirror of https://github.com/discourse/discourse-assign.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: Hide group tab when there are no assignments, add everyone count (#83)

This commit is contained in:
Ahmed Gagan 2020-07-21 20:56:40 +05:30 committed by GitHub
parent 816f3c0e97
commit cd3e5763d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/javascripts/discourse-assign/controllers/group-assignments.js.es6
View File

@ -21,7 +21,7 @@ export default Controller.extend({
if (this.model.members.length >= this.offset + 50) { if (this.model.members.length >= this.offset + 50) {
this.set("loading", true); this.set("loading", true);
this.set("offset", this.offset + 50); this.set("offset", this.offset + 50);
ajax(`/assign/members/${this.groupName}?offset=${this.offset}`).then( ajax(`/assign/members/${this.group.name}?offset=${this.offset}`).then(
result => { result => {
this.members.pushObjects(result.members); this.members.pushObjects(result.members);
this.set("loading", false); this.set("loading", false);

6
assets/javascripts/discourse-assign/routes/group-assignments.js.es6
View File

@ -1,7 +1,7 @@
import Route from "@ember/routing/route"; import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
export default Route.extend({ export default DiscourseRoute.extend({
model() { model() {
return ajax(`/assign/members/${this.modelFor("group").get("name")}`); return ajax(`/assign/members/${this.modelFor("group").get("name")}`);
}, },
@ -10,7 +10,7 @@ export default Route.extend({
controller.setProperties({ controller.setProperties({
model, model,
members: [], members: [],
groupName: this.modelFor("group").get("name") group: this.modelFor("group")
}); });
controller.findMembers(true); controller.findMembers(true);

7
assets/javascripts/discourse/components/group-assignments-menu-item.js.es6
View File

@ -3,6 +3,11 @@ export default Ember.Component.extend({
init() { init() {
this._super(...arguments); this._super(...arguments);
this.set("canAssign", this.currentUser && this.currentUser.can_assign); this.set(
"displayAssignTab",
this.currentUser &&
this.currentUser.can_assign &&
this.group.assignment_count > 0
);
} }
}); });

2
assets/javascripts/discourse/templates/components/group-assignments-filter.hbs
View File

@ -4,6 +4,6 @@
{{/link-to}} {{/link-to}}
{{else}} {{else}}
{{#link-to "group.assignments.show" filter}} {{#link-to "group.assignments.show" filter}}
{{i18n 'discourse_assign.group_everyone'}} {{i18n 'discourse_assign.group_everyone'}} ({{assignment_count}})
{{/link-to}} {{/link-to}}
{{/if}} {{/if}}

6
assets/javascripts/discourse/templates/components/group-assignments-menu-item.hbs
View File

@ -1,8 +1,8 @@
{{#if canAssign}} {{#if displayAssignTab}}
<ul class ='nav-pills'> <ul class ='nav-pills'>
<li> <li>
{{#link-to 'group.assignments' group}} {{#link-to "group.assignments"}}
{{d-icon "user-plus" class="glyph"}}{{i18n 'discourse_assign.group_assignments'}}{{concat ' (' group.assignment_count concat ')'}} {{d-icon "user-plus" class="glyph"}}{{i18n 'discourse_assign.group_assignments'}} ({{group.assignment_count}})
{{/link-to}} {{/link-to}}
</li> </li>
</ul> </ul>

2
assets/javascripts/discourse/templates/group/assignments.hbs
View File

@ -1,7 +1,7 @@
<section class="user-secondary-navigation"> <section class="user-secondary-navigation">
{{#mobile-nav class="activity-nav" desktopClass="action-list activity-list nav-stacked" currentPath=router._router.currentPath}} {{#mobile-nav class="activity-nav" desktopClass="action-list activity-list nav-stacked" currentPath=router._router.currentPath}}
{{#load-more selector=".activity-nav li" action=(action "loadMore")}} {{#load-more selector=".activity-nav li" action=(action "loadMore")}}
{{group-assignments-filter show-avatar=false filter="everyone" routeType=route_type}} {{group-assignments-filter show-avatar=false filter="everyone" routeType=route_type assignment_count=group.assignment_count}}
{{#each members as |member|}} {{#each members as |member|}}
{{group-assignments-filter show-avatar=true filter=member routeType=route_type}} {{group-assignments-filter show-avatar=true filter=member routeType=route_type}}
{{/each}} {{/each}}