discourse/discourse-solved
1
0
Fork 0
mirror of https://github.com/discourse/discourse-solved.git synced 2025-07-05 13:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove excerpt stuff, only show quote once clicked

Browse Source
This commit is contained in:
David Taylor 2017-03-08 00:38:15 +00:00
parent f38c7a3991
commit 4aaeee8aec
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
View File

@ -47,8 +47,7 @@ function acceptPost(post) {
topic.set('accepted_answer', { topic.set('accepted_answer', {
username: post.get('username'), username: post.get('username'),
post_number: post.get('post_number'), post_number: post.get('post_number')
excerpt: post.get('cooked')
}); });
ajax("/solution/accept", { ajax("/solution/accept", {
@ -155,24 +154,20 @@ function initializeWithApi(api) {
if (postModel) { if (postModel) {
const topic = postModel.get('topic'); const topic = postModel.get('topic');
if (topic.get('accepted_answer')) { if (topic.get('accepted_answer')) {
var rawhtml = ` var rawhtml = `
<aside class='quote' data-post="${topic.get('accepted_answer').post_number}" data-topic="${topic.id}"><div class='title'> <aside class='quote' data-post="${topic.get('accepted_answer').post_number}" data-topic="${topic.get('id')}">
<div class='title'>
${topic.get('acceptedAnswerHtml')} <div class="quote-controls"><\/div> ${topic.get('acceptedAnswerHtml')} <div class="quote-controls"><\/div>
</div> </div>
<blockquote> <blockquote></blockquote>
${topic.get('accepted_answer').excerpt}
</blockquote>
</aside>` </aside>`
console.log(topic.id); var cooked = new PostCooked({cooked:rawhtml});
var cooked = new PostCooked({cooked:rawhtml, topicId: topic.id});
var html = cooked.init(); var html = cooked.init();
return dec.rawHtml(html); return dec.rawHtml(html);
// html = postModel._insertQuoteControls(html);
// return html;
} }
} }
} }

10
plugin.rb
View File

@ -224,19 +224,17 @@ SQL
{ {
post_number: info[0], post_number: info[0],
username: info[1], username: info[1],
excerpt: info[2]
} }
end end
end end
def accepted_answer_post_info def accepted_answer_post_info
# TODO: we may already have it in the stream ... so bypass query here # TODO: we may already have it in the stream ... so bypass query here
post = Post.where(id: accepted_answer_post_id, topic_id: object.topic.id).joins(:user).first
excerpt = post.excerpt
return [post.post_number, post.username, post.excerpt(100)]
Post.where(id: accepted_answer_post_id, topic_id: object.topic.id)
.joins(:user)
.pluck('post_number, username')
.first
end end
def accepted_answer_post_id def accepted_answer_post_id