From e85f9d6867f941bad30beb360aa0c5418b08fb44 Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Thu, 12 Jan 2023 18:44:49 +0100 Subject: [PATCH] Re-add support for detail page `display_all` condition --- app/views/answerbox/_header.html.haml | 4 ++-- app/views/application/_answerbox.html.haml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/answerbox/_header.html.haml b/app/views/answerbox/_header.html.haml index 88c1485f..b9831611 100644 --- a/app/views/answerbox/_header.html.haml +++ b/app/views/answerbox/_header.html.haml @@ -14,9 +14,9 @@ %a{ href: question_path(a.question.user.screen_name, a.question.id) } = t(".answers", count: a.question.answer_count) .answerbox__question-body{ data: { controller: "collapse" } } - .answerbox__question-text{ class: a.question.long? ? "collapsed" : "", data: { collapse_target: "content" } } + .answerbox__question-text{ class: a.question.long? && !display_all ? "collapsed" : "", data: { collapse_target: "content" } } = question_markdown a.question.content - - if a.question.long? + - if a.question.long? && !display_all = render "shared/collapse", type: "question" - if user_signed_in? .flex-shrink-0.ms-auto diff --git a/app/views/application/_answerbox.html.haml b/app/views/application/_answerbox.html.haml index 16128606..fc37071d 100644 --- a/app/views/application/_answerbox.html.haml +++ b/app/views/application/_answerbox.html.haml @@ -1,12 +1,12 @@ - display_all ||= nil .card.answerbox{ data: { id: a.id, q_id: a.question.id } } - if @question.nil? - = render "answerbox/header", a: a + = render "answerbox/header", a: a, display_all: display_all .card-body .answerbox__answer-body{ data: { controller: "collapse" } } - .answerbox__answer-text{ class: a.long? ? "collapsed" : "", data: { collapse_target: "content" } } + .answerbox__answer-text{ class: a.long? && !display_all ? "collapsed" : "", data: { collapse_target: "content" } } = markdown a.content - - if a.long? + - if a.long? && !display_all = render "shared/collapse", type: "answer" - if @user.nil? .row