mirror of
https://github.com/discourse/discourse.git
synced 2025-04-29 19:34:39 +08:00
UX: Show Topic column in invites pending tab (#12413)
This commit is contained in:
parent
49a3fcb0f1
commit
eda8a839d4
@ -2,6 +2,7 @@ import EmberObject from "@ember/object";
|
|||||||
import { alias } from "@ember/object/computed";
|
import { alias } from "@ember/object/computed";
|
||||||
import { Promise } from "rsvp";
|
import { Promise } from "rsvp";
|
||||||
import discourseComputed from "discourse-common/utils/decorators";
|
import discourseComputed from "discourse-common/utils/decorators";
|
||||||
|
import Topic from "discourse/models/topic";
|
||||||
import User from "discourse/models/user";
|
import User from "discourse/models/user";
|
||||||
import { ajax } from "discourse/lib/ajax";
|
import { ajax } from "discourse/lib/ajax";
|
||||||
import { isNone } from "@ember/utils";
|
import { isNone } from "@ember/utils";
|
||||||
@ -38,6 +39,11 @@ const Invite = EmberObject.extend({
|
|||||||
return groups ? groups.map((group) => group.id) : [];
|
return groups ? groups.map((group) => group.id) : [];
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@discourseComputed("topics.firstObject")
|
||||||
|
topic(topicData) {
|
||||||
|
return topicData ? Topic.create(topicData) : null;
|
||||||
|
},
|
||||||
|
|
||||||
topicId: alias("topics.firstObject.id"),
|
topicId: alias("topics.firstObject.id"),
|
||||||
topicTitle: alias("topics.firstObject.title"),
|
topicTitle: alias("topics.firstObject.title"),
|
||||||
});
|
});
|
||||||
|
@ -92,6 +92,7 @@
|
|||||||
<th>{{i18n "user.invited.invited_via"}}</th>
|
<th>{{i18n "user.invited.invited_via"}}</th>
|
||||||
{{#if currentUser.staff}}
|
{{#if currentUser.staff}}
|
||||||
<th>{{i18n "user.invited.groups"}}</th>
|
<th>{{i18n "user.invited.groups"}}</th>
|
||||||
|
<th>{{i18n "user.invited.topic"}}</th>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
<th>{{i18n "user.invited.sent"}}</th>
|
<th>{{i18n "user.invited.sent"}}</th>
|
||||||
<th>{{i18n "user.invited.expires_at"}}</th>
|
<th>{{i18n "user.invited.expires_at"}}</th>
|
||||||
@ -118,6 +119,14 @@
|
|||||||
—
|
—
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</td>
|
</td>
|
||||||
|
<td class="invite-topic">
|
||||||
|
<div class="label">{{i18n "user.invited.topic"}}</div>
|
||||||
|
{{#if invite.topic}}
|
||||||
|
<a href={{invite.topic.url}}>{{invite.topic.title}}</a>
|
||||||
|
{{else}}
|
||||||
|
—
|
||||||
|
{{/if}}
|
||||||
|
</td>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
<td class="invite-updated-at">
|
<td class="invite-updated-at">
|
||||||
<div class="label">{{i18n "user.invited.sent"}}</div>
|
<div class="label">{{i18n "user.invited.sent"}}</div>
|
||||||
|
@ -347,9 +347,8 @@
|
|||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
td.invite-groups {
|
td.invite-groups,
|
||||||
grid-column-start: 1;
|
td.invite-topic {
|
||||||
grid-column-end: -1;
|
|
||||||
order: 3;
|
order: 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1450,6 +1450,7 @@ en:
|
|||||||
invited_via: "Invitation"
|
invited_via: "Invitation"
|
||||||
invited_via_link: "link (%{count} / %{max} redeemed)"
|
invited_via_link: "link (%{count} / %{max} redeemed)"
|
||||||
groups: "Groups"
|
groups: "Groups"
|
||||||
|
topic: "Topic"
|
||||||
sent: "Created/Last Sent"
|
sent: "Created/Last Sent"
|
||||||
expires_at: "Expires"
|
expires_at: "Expires"
|
||||||
edit: "Edit"
|
edit: "Edit"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user