Fixing sharing story by email if the story has no feed.

This commit is contained in:
Samuel Clay 2013-02-14 15:59:03 -08:00
parent 366797280c
commit 5dd28cb197
2 changed files with 3 additions and 3 deletions

View file

@ -1464,7 +1464,7 @@ def send_story_email(request):
message = "Email error: %s" % str(e)
logging.user(request, '~BMSharing story by email to %s recipient%s: ~FY~SB%s~SN~BM~FY/~SB%s' %
(len(to_addresses), '' if len(to_addresses) == 1 else 's',
story['story_title'][:50], feed.feed_title[:50]))
story['story_title'][:50], feed and feed.feed_title[:50]))
return {'code': code, 'message': message}

View file

@ -43,10 +43,10 @@ _.extend(NEWSBLUR.ReaderSendEmail.prototype, {
$.make('div', { className: 'NB-modal-error'}),
$.make('h2', { className: 'NB-modal-title' }, 'Send Story by Email'),
$.make('h2', { className: 'NB-modal-subtitle' }, [
$.make('div', { className: 'NB-modal-email-feed' }, [
(this.feed && $.make('div', { className: 'NB-modal-email-feed' }, [
$.make('img', { className: 'NB-modal-feed-image feed_favicon', src: $.favicon(this.feed) }),
$.make('div', { className: 'NB-modal-feed-title' }, this.feed.get('feed_title'))
]),
])),
$.make('div', { className: 'NB-modal-email-story-title' }, this.story.story_title),
$.make('div', { className: 'NB-modal-email-story-permalink' }, this.story.story_permalink)
]),