diff --git a/assets/javascripts/discourse-assign/connectors/group-reports-nav-item/assigned-topic-list.hbs b/assets/javascripts/discourse-assign/connectors/group-reports-nav-item/assigned-topic-list.hbs index 0a79748..8389064 100644 --- a/assets/javascripts/discourse-assign/connectors/group-reports-nav-item/assigned-topic-list.hbs +++ b/assets/javascripts/discourse-assign/connectors/group-reports-nav-item/assigned-topic-list.hbs @@ -1 +1 @@ -{{group-assigned-menu-item group=group}} \ No newline at end of file + \ No newline at end of file diff --git a/assets/javascripts/discourse-assign/connectors/user-preferences-notifications/remind-assigns-frequency.hbs b/assets/javascripts/discourse-assign/connectors/user-preferences-notifications/remind-assigns-frequency.hbs index e09a71f..4d8899c 100644 --- a/assets/javascripts/discourse-assign/connectors/user-preferences-notifications/remind-assigns-frequency.hbs +++ b/assets/javascripts/discourse-assign/connectors/user-preferences-notifications/remind-assigns-frequency.hbs @@ -1 +1 @@ -{{remind-assigns-frequency user=model}} \ No newline at end of file + \ No newline at end of file diff --git a/assets/javascripts/discourse/templates/components/assigned-topic-list-item.hbs b/assets/javascripts/discourse/templates/components/assigned-topic-list-item.hbs index f1bd93e..e42e8a6 100644 --- a/assets/javascripts/discourse/templates/components/assigned-topic-list-item.hbs +++ b/assets/javascripts/discourse/templates/components/assigned-topic-list-item.hbs @@ -68,21 +68,21 @@ }} {{#if topic.assigned_to_user}} - {{assign-actions-dropdown - topic=topic - assignee=topic.assigned_to_user.username - unassign=unassign - reassign=reassign - }} + {{else if topic.assigned_to_group}} - {{assign-actions-dropdown - topic=topic - assignee=topic.assigned_to_group.name - group=true - unassign=unassign - reassign=reassign - }} + {{else}} - {{assign-actions-dropdown topic=topic unassign=unassign}} + {{/if}} \ No newline at end of file diff --git a/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs b/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs index 27c26d4..8859516 100644 --- a/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs +++ b/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs @@ -20,22 +20,22 @@ {{#each filteredTopics as |topic|}} - {{assigned-topic-list-item - topic=topic - bulkSelectEnabled=bulkSelectEnabled - showTopicPostBadges=showTopicPostBadges - hideCategory=hideCategory - showPosters=true - showLikes=showLikes - showOpLikes=showOpLikes - expandGloballyPinned=expandGloballyPinned - expandAllPinned=expandAllPinned - lastVisitedTopic=lastVisitedTopic - selected=selected - tagsForUser=tagsForUser - unassign=unassign - reassign=reassign - }} + {{raw "list/visited-line" lastVisitedTopic=lastVisitedTopic topic=topic}} {{/each}} diff --git a/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs b/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs index 21de06d..9cf8464 100644 --- a/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs +++ b/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs @@ -12,24 +12,24 @@ {{/if}} {{#if topics}} - {{assigned-topic-list - showPosters=showPosters - hideCategory=hideCategory - topics=topics - expandExcerpts=expandExcerpts - bulkSelectEnabled=bulkSelectEnabled - canBulkSelect=canBulkSelect - bulkSelectAction=bulkSelectAction - selected=selected - skipHeader=skipHeader - tagsForUser=tagsForUser - changeSort=changeSort - toggleBulkSelect=toggleBulkSelect - unassign=unassign - reassign=reassign - onScroll=onScroll - scrollOnLoad=scrollOnLoad - }} + {{else}} {{#unless loadingMore}}
diff --git a/assets/javascripts/discourse/templates/group-topics-list.hbs b/assets/javascripts/discourse/templates/group-topics-list.hbs index ed19ee7..79722a0 100644 --- a/assets/javascripts/discourse/templates/group-topics-list.hbs +++ b/assets/javascripts/discourse/templates/group-topics-list.hbs @@ -16,25 +16,25 @@ @action={{action "loadMore"}} > - {{basic-assigned-topic-list - topicList=model - hideCategory=hideCategory - showPosters=showPosters - bulkSelectEnabled=bulkSelectEnabled - canBulkSelect=canBulkSelect - selected=selected - hasIncoming=hasIncoming - incomingCount=incomingCount - showInserted=(action "showInserted") - tagsForUser=tagsForUser - changeSort=(action "changeSort") - toggleBulkSelect=(action "toggleBulkSelect") - bulkSelectAction=(action "refresh") - unassign=(action "unassign") - reassign=(action "reassign") - onScroll=saveScrollPosition - scrollOnLoad=true - }} + \ No newline at end of file diff --git a/assets/javascripts/discourse/templates/group/assigned.hbs b/assets/javascripts/discourse/templates/group/assigned.hbs index 1d505f8..ea67982 100644 --- a/assets/javascripts/discourse/templates/group/assigned.hbs +++ b/assets/javascripts/discourse/templates/group/assigned.hbs @@ -17,34 +17,34 @@
{{/if}} - {{group-assigned-filter - showAvatar=false - filter="everyone" - routeType=route_type - assignmentCount=group.assignment_count - search=search - ascending=ascending - order=order - }} - {{group-assigned-filter - showAvatar=false - groupName=group.name - filter=group.name - routeType=route_type - assignmentCount=group.group_assignment_count - search=search - ascending=ascending - order=order - }} + + {{#each members as |member|}} - {{group-assigned-filter - showAvatar=true - filter=member - routeType=route_type - search=search - ascending=ascending - order=order - }} + {{/each}} diff --git a/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs b/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs index b689531..62a5fb3 100644 --- a/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs +++ b/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs @@ -28,22 +28,22 @@
{{#if topic.assigned_to_user}} - {{assign-actions-dropdown - topic=topic - assignee=topic.assigned_to_user.username - unassign=unassign - reassign=reassign - }} + {{else if topic.assigned_to_group}} - {{assign-actions-dropdown - topic=topic - assignee=topic.assigned_to_group.name - group=true - unassign=unassign - reassign=reassign - }} + {{else}} - {{assign-actions-dropdown topic=topic unassign=unassign}} + {{/if}}
diff --git a/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs b/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs index 40f52a6..f8e96e4 100644 --- a/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs +++ b/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs @@ -15,16 +15,16 @@ {{#each topics as |t|}} - {{assigned-topic-list-item - topic=t - expandGloballyPinned=expandGloballyPinned - expandAllPinned=expandAllPinned - lastVisitedTopic=lastVisitedTopic - selected=selected - tagsForUser=tagsForUser - unassign=unassign - reassign=reassign - }} + {{/each}}
diff --git a/assets/javascripts/discourse/templates/modal/assign-user.hbs b/assets/javascripts/discourse/templates/modal/assign-user.hbs index 1dfbe43..ec6ce69 100644 --- a/assets/javascripts/discourse/templates/modal/assign-user.hbs +++ b/assets/javascripts/discourse/templates/modal/assign-user.hbs @@ -2,13 +2,13 @@
- {{assignee-chooser + {{#if this.assigneeError}} {{d-icon "exclamation-triangle"}} diff --git a/assets/javascripts/discourse/templates/user-activity-assigned.hbs b/assets/javascripts/discourse/templates/user-activity-assigned.hbs index 5ccd0b5..9b1bf45 100644 --- a/assets/javascripts/discourse/templates/user-activity-assigned.hbs +++ b/assets/javascripts/discourse/templates/user-activity-assigned.hbs @@ -22,22 +22,22 @@ @selector=".paginated-topics-list .topic-list tr" @action={{action "loadMore"}} > - {{basic-assigned-topic-list - topicList=model - hideCategory=hideCategory - showPosters=true - bulkSelectEnabled=bulkSelectEnabled - selected=selected - hasIncoming=hasIncoming - incomingCount=incomingCount - showInserted=(action "showInserted") - tagsForUser=tagsForUser - changeSort=(action "changeSort") - unassign=(action "unassign") - reassign=(action "reassign") - onScroll=saveScrollPosition - scrollOnLoad=true - }} + diff --git a/package.json b/package.json index 1de37ba..47cabec 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,6 @@ "author": "Discourse", "license": "MIT", "devDependencies": { - "eslint-config-discourse": "^3.3.0" + "eslint-config-discourse": "^3.4.0" } } diff --git a/yarn.lock b/yarn.lock index 3aee372..90be8cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1145,7 +1145,7 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -eslint-config-discourse@^3.3.0: +eslint-config-discourse@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-3.4.0.tgz#636a1824bca48c90aeac5bee2f8d7b993609191f" integrity sha512-9jwu8GQPDOxAO0ByV6RbInu5r39HrFvbAHQRJ8YoGg2fuvHcX+p7fYcxEWj64LhmF4qD55cAGhN0Gmj10RVjoQ==