Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hide tab #83

Merged
merged 10 commits into from Jul 21, 2020
Merged

Hide tab #83

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
84dee81
display name changed as per site settings
Ahmedgagan Jul 13, 2020
edc25c3
Revert "display name changed as per site settings"
Ahmedgagan Jul 13, 2020
a088feb
Merge branch 'master' of https://github.com/discourse/discourse-assign
Ahmedgagan Jul 14, 2020
bfcfec6
Merge branch 'master' of https://github.com/discourse/discourse-assign
Ahmedgagan Jul 15, 2020
05d6426
Merge branch 'master' of https://github.com/discourse/discourse-assign
Ahmedgagan Jul 16, 2020
4f1cd70
Merge branch 'master' of https://github.com/discourse/discourse-assign
Ahmedgagan Jul 17, 2020
26319a0
Merge branch 'master' of https://github.com/discourse/discourse-assign
Ahmedgagan Jul 20, 2020
a4df782
Merge branch 'master' of https://github.com/discourse/discourse-assig…
Ahmedgagan Jul 21, 2020
c4715c4
Hiding assignments-tab and added assignment count to Everyone
Ahmedgagan Jul 21, 2020
ba7b6e8
changes done as per comments
Ahmedgagan Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/javascripts/discourse-assign/controllers/group-assignments.js.es6
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ export default Controller.extend({
if (this.model.members.length >= this.offset + 50) {
this.set("loading", true);
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 => {
this.members.pushObjects(result.members);
this.set("loading", false);
Expand Down
6 changes: 3 additions & 3 deletions assets/javascripts/discourse-assign/routes/group-assignments.js.es6
View file
Open in desktop
@@ -1,7 +1,7 @@
import Route from "@ember/routing/route";
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";

export default Route.extend({
export default DiscourseRoute.extend({
model() {
return ajax(`/assign/members/${this.modelFor("group").get("name")}`);
},
Expand All @@ -10,7 +10,7 @@ export default Route.extend({
controller.setProperties({
model,
members: [],
groupName: this.modelFor("group").get("name")
group: this.modelFor("group")
});

controller.findMembers(true);
Expand Down
7 changes: 6 additions & 1 deletion assets/javascripts/discourse/components/group-assignments-menu-item.js.es6
View file
Open in desktop
Expand Up @@ -3,6 +3,11 @@ export default Ember.Component.extend({

init() {
this._super(...arguments);
this.set("canAssign", this.currentUser && this.currentUser.can_assign);
this.set(
"canAssign",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should rename this to "displayAssignTab" or something. Because it doesn't mean 'canAssign' any more

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, ill rename this

this.currentUser &&
this.currentUser.can_assign &&
this.group.assignment_count > 0
);
}
});
2 changes: 1 addition & 1 deletion assets/javascripts/discourse/templates/components/group-assignments-filter.hbs
View file
Open in desktop
Expand Up @@ -4,6 +4,6 @@
{{/link-to}}
{{else}}
{{#link-to "group.assignments.show" filter}}
{{i18n 'discourse_assign.group_everyone'}}
{{i18n 'discourse_assign.group_everyone'}} ({{assignment_count}})
{{/link-to}}
{{/if}}
4 changes: 2 additions & 2 deletions assets/javascripts/discourse/templates/components/group-assignments-menu-item.hbs
View file
Open in desktop
@@ -1,8 +1,8 @@
{{#if canAssign}}
<ul class ='nav-pills'>
<li>
{{#link-to 'group.assignments' group}}
{{d-icon "user-plus" class="glyph"}}{{i18n 'discourse_assign.group_assignments'}}{{concat ' (' group.assignment_count concat ')'}}
{{#link-to "group.assignments" group.assignment_count}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That seems a bit weird. Did you mean to change this? I don't see why we would want to pass the count into the link-to component?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yaa this was supposed to remove😅, i just added it to test something😅

{{d-icon "user-plus" class="glyph"}}{{i18n 'discourse_assign.group_assignments'}} ({{group.assignment_count}})
{{/link-to}}
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/discourse/templates/group/assignments.hbs
View file
Open in desktop
@@ -1,7 +1,7 @@
<section class="user-secondary-navigation">
{{#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")}}
{{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|}}
{{group-assignments-filter show-avatar=true filter=member routeType=route_type}}
{{/each}}
Expand Down