github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-05-03 18:14:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Gracefully handle non-existent/deleted users during rendering

Browse Source
This commit is contained in:
Toby Zerner 2015-05-03 12:08:41 +09:30
parent 8d406e5d24
commit eabd482921
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
framework/core/js/forum/src/components/discussion-list.js
View File

@ -99,10 +99,10 @@ export default class DiscussionList extends Component {
return m('div', [ return m('div', [
m('ul.discussions-list', [ m('ul.discussions-list', [
this.discussions().map(discussion => { this.discussions().map(discussion => {
var startUser = discussion.startUser() var startUser = discussion.startUser();
var isUnread = discussion.isUnread() var isUnread = discussion.isUnread();
var displayUnread = this.countType() !== 'replies' && isUnread var displayUnread = this.countType() !== 'replies' && isUnread;
var jumpTo = Math.min(discussion.lastPostNumber(), (discussion.readNumber() || 0) + 1) var jumpTo = Math.min(discussion.lastPostNumber(), (discussion.readNumber() || 0) + 1);
var controls = discussion.controls(this).toArray(); var controls = discussion.controls(this).toArray();
@ -116,13 +116,13 @@ export default class DiscussionList extends Component {
buttonClass: 'btn btn-default btn-icon btn-sm btn-naked', buttonClass: 'btn btn-default btn-icon btn-sm btn-naked',
menuClass: 'pull-right' menuClass: 'pull-right'
}) : '', }) : '',
m('a.author', { m((startUser ? 'a' : 'span')+'.author', {
href: app.route('user', { username: startUser.username() }), href: startUser ? app.route('user', { username: startUser.username() }) : undefined,
config: function(element, isInitialized, context) { config: function(element, isInitialized, context) {
$(element).tooltip({ placement: 'right' }) $(element).tooltip({ placement: 'right' })
m.route.call(this, element) m.route.call(this, element)
}, },
title: 'Started by '+startUser.username()+' '+humanTime(discussion.startTime()) title: 'Started by '+(startUser ? startUser.username() : '[deleted]')+' '+humanTime(discussion.startTime())
}, [ }, [
avatar(startUser, {title: ''}) avatar(startUser, {title: ''})
]), ]),

2
framework/core/js/forum/src/components/post-comment.js
View File

@ -24,7 +24,7 @@ export default class PostComment extends Component {
this.subtree = new SubtreeRetainer( this.subtree = new SubtreeRetainer(
() => this.props.post.freshness, () => this.props.post.freshness,
() => this.props.post.user().freshness, () => this.props.post.user() && this.props.post.user().freshness,
this.postHeaderUser.showCard this.postHeaderUser.showCard
); );
} }

4
framework/core/js/forum/src/components/post-header-user.js
View File

@ -31,7 +31,9 @@ export default class PostHeaderUser extends Component {
username() username()
] ]
), ),
this.showCard() ? UserCard.component({user, className: 'user-card-popover fade', controlsButtonClass: 'btn btn-default btn-icon btn-sm btn-naked'}) : '' user && this.showCard()
? UserCard.component({user, className: 'user-card-popover fade', controlsButtonClass: 'btn btn-default btn-icon btn-sm btn-naked'})
: ''
]); ]);
} }

3
framework/core/js/forum/src/components/terminal-post.js
View File

@ -1,5 +1,6 @@
import Component from 'flarum/component'; import Component from 'flarum/component';
import humanTime from 'flarum/utils/human-time'; import humanTime from 'flarum/utils/human-time';
import username from 'flarum/helpers/username';
/** /**
Displays information about a the first or last post in a discussion. Displays information about a the first or last post in a discussion.
@ -16,7 +17,7 @@ export default class TerminalPost extends Component {
var lastPost = this.props.lastPost && discussion.repliesCount(); var lastPost = this.props.lastPost && discussion.repliesCount();
return m('span', [ return m('span', [
m('span.username', discussion[lastPost ? 'lastUser' : 'startUser']().username()), username(discussion[lastPost ? 'lastUser' : 'startUser']()),
lastPost ? ' replied ' : ' started ', lastPost ? ' replied ' : ' started ',
m('time', humanTime(discussion[lastPost ? 'lastTime' : 'startTime']())) m('time', humanTime(discussion[lastPost ? 'lastTime' : 'startTime']()))
]) ])