Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Link embeded topic to second post. They've already read the first.

This commit is contained in:
Robin Ward 2014-01-02 11:59:20 -05:00
parent 15faa01178
commit 01be681a95
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/embed_controller.rb
View File

@ -11,6 +11,7 @@ class EmbedController < ApplicationController
if topic_id if topic_id
@topic_view = TopicView.new(topic_id, current_user, {best: 5}) @topic_view = TopicView.new(topic_id, current_user, {best: 5})
@second_post_url = "#{@topic_view.topic.url}/2"
else else
Jobs.enqueue(:retrieve_topic, user_id: current_user.try(:id), embed_url: embed_url) Jobs.enqueue(:retrieve_topic, user_id: current_user.try(:id), embed_url: embed_url)
render 'loading' render 'loading'

4
app/views/embed/best.html.erb
View File

@ -1,6 +1,6 @@
<header> <header>
<%- if @topic_view.posts.present? %> <%- if @topic_view.posts.present? %>
<%= link_to(I18n.t('embed.title'), @topic_view.topic.url, class: 'button', target: '_blank') %> <%= link_to(I18n.t('embed.title'), @second_post_url, class: 'button', target: '_blank') %>
<%- else %> <%- else %>
<%= link_to(I18n.t('embed.start_discussion'), @topic_view.topic.url, class: 'button', target: '_blank') %> <%= link_to(I18n.t('embed.start_discussion'), @topic_view.topic.url, class: 'button', target: '_blank') %>
<%- end if %> <%- end if %>
@ -22,7 +22,7 @@
<%- end %> <%- end %>
<footer> <footer>
<%= link_to(I18n.t('embed.continue'), @topic_view.topic.url, class: 'button', target: '_blank') %> <%= link_to(I18n.t('embed.continue'), @second_post_url, class: 'button', target: '_blank') %>
<%= link_to(image_tag(SiteSetting.logo_url, class: 'logo'), Discourse.base_url, target: '_blank') %> <%= link_to(image_tag(SiteSetting.logo_url, class: 'logo'), Discourse.base_url, target: '_blank') %>
</footer> </footer>