diff --git a/frappe/templates/discussions/comment_box.html b/frappe/templates/discussions/comment_box.html index ebaa37f772..ab4714185a 100644 --- a/frappe/templates/discussions/comment_box.html +++ b/frappe/templates/discussions/comment_box.html @@ -1,31 +1,35 @@
-
-
-
- -
+ {% if not single_thread %} +
+
+
+
+
+ {% endif %} -
-
-
- -
+
+
+
+
+
-
-
- {{ _("Press Cmd+Enter to post your comment") }} -
- - {{ _("Cancel") }} -
- {{ _("Post") }}
+
+
+ {{ _("Press Cmd+Enter to post your comment") }}
- + + {{ _("Cancel") }} +
+ {{ _("Post") }} +
+
+ diff --git a/frappe/templates/discussions/discussions.js b/frappe/templates/discussions/discussions.js index 8b36d0846c..af49dc29d6 100644 --- a/frappe/templates/discussions/discussions.js +++ b/frappe/templates/discussions/discussions.js @@ -87,18 +87,23 @@ const setup_socket_io = () => { }; const publish_message = (data) => { - const doctype = decodeURIComponent($(".discussions-parent .thread-card").attr("data-doctype")); - const docname = decodeURIComponent($(".discussions-parent .thread-card").attr("data-docname")); + const doctype = decodeURIComponent($(".discussions-parent").attr("data-doctype")); + const docname = decodeURIComponent($(".discussions-parent").attr("data-docname")); const topic = data.topic_info; - if ($(`.discussion-on-page[data-topic=${topic.name}]`).length) { + console.log(topic, doctype, topic.reference_doctype, docname, topic.reference_docname, doctype == topic.reference_doctype, docname == topic.reference_docname) + console.log(topic.owner, frappe.session.user, topic.owner == frappe.session.user) + console.log(topic.owner == frappe.session.user && doctype == topic.reference_doctype && docname == topic.reference_docname) + console.log(topic.title) + if ($(`.discussion-on-page[data-topic=${topic.name}]`).length) { + console.log("if") post_message_cleanup(); $('
' + data.template) .insertBefore(`.discussion-on-page[data-topic=${topic.name}] .discussion-form`); - } else if (doctype == topic.reference_doctype && docname == topic.reference_docname) { - + } else if (doctype == topic.reference_doctype && docname == topic.reference_docname && $(".reply-card").length) { + console.log("elif") post_message_cleanup(); data.new_topic_template = style_avatar_frame(data.new_topic_template); @@ -106,13 +111,13 @@ const publish_message = (data) => { $(`#discussion-group`).prepend(data.new_topic_template); if (topic.owner == frappe.session.user) { - $(".discussion-on-page").collapse(); + $(".discussion-on-page") && $(".discussion-on-page").collapse(); $(".sidebar-topic").first().click(); } - } else if (topic.owner == frappe.session.user - && doctype == topic.reference_docname && docname == topic.reference_docname) { + } else if (topic.owner == frappe.session.user && doctype == topic.reference_doctype && docname == topic.reference_docname) { post_message_cleanup(); + console.log("in") window.location.reload(); } @@ -198,10 +203,10 @@ const submit_discussion = (e) => { const reply = $(".comment-field:visible").val().trim(); if (reply) { - let doctype = $(e.currentTarget).closest(".thread-card").attr("data-doctype"); + let doctype = $(e.currentTarget).closest(".discussions-parent").attr("data-doctype"); doctype = doctype ? decodeURIComponent(doctype) : doctype; - let docname = $(e.currentTarget).closest(".thread-card").attr("data-docname"); + let docname = $(e.currentTarget).closest(".discussions-parent").attr("data-docname"); docname = docname ? decodeURIComponent(docname) : docname; frappe.call({ diff --git a/frappe/templates/discussions/discussions_section.html b/frappe/templates/discussions/discussions_section.html index b9fa80fe4f..f62dde112e 100644 --- a/frappe/templates/discussions/discussions_section.html +++ b/frappe/templates/discussions/discussions_section.html @@ -1,9 +1,11 @@ {% set topics = frappe.get_all("Discussion Topic", {"reference_doctype": doctype, "reference_docname": docname}, ["name", "title", "owner", "creation"]) %} -{% include "frappe/templates/discussions/topic_modal.html" %} -
+
+ + {% include "frappe/templates/discussions/topic_modal.html" %} +
{{ _(title) }} {% if topics %} @@ -11,20 +13,24 @@ {% endif %}
- -
+
{% if topics %} + + {% if not single_thread %}
{% include "frappe/templates/discussions/search.html" %} + {% for topic in topics %} {% set replies = frappe.get_all("Discussion Reply", {"topic": topic.name})%} {% include "frappe/templates/discussions/sidebar.html" %} {% endfor %}
+ {% endif %}
+ {% for topic in topics %} {% include "frappe/templates/discussions/reply_section.html" %} + {% endfor %}
{% elif not topics and single_thread %} diff --git a/frappe/templates/discussions/reply_section.html b/frappe/templates/discussions/reply_section.html index e2f86da5f9..0a9d3fdfbe 100644 --- a/frappe/templates/discussions/reply_section.html +++ b/frappe/templates/discussions/reply_section.html @@ -1,8 +1,6 @@ -{% for topic in topics %} {% set replies = frappe.get_all("Discussion Reply", {"topic": topic.name}, ["reply", "owner", "creation"], order_by="creation")%} -{% if replies %}
@@ -34,5 +32,3 @@ {% endif %}
-{% endif %} -{% endfor %} diff --git a/frappe/templates/styles/discussion_style.css b/frappe/templates/styles/discussion_style.css index 7aa6a02d5a..44f3a649fd 100644 --- a/frappe/templates/styles/discussion_style.css +++ b/frappe/templates/styles/discussion_style.css @@ -3,7 +3,7 @@ padding: 1rem; } -.discussions-parent .form-control { +.thread-card .form-control { background-color: #FFFFFF; font-size: inherit; color: inherit; diff --git a/frappe/website/doctype/discussion_reply/discussion_reply.py b/frappe/website/doctype/discussion_reply/discussion_reply.py index 82e379c7d4..9665817fca 100644 --- a/frappe/website/doctype/discussion_reply/discussion_reply.py +++ b/frappe/website/doctype/discussion_reply/discussion_reply.py @@ -27,7 +27,7 @@ class DiscussionReply(Document): }) new_topic_template = frappe.render_template("frappe/templates/discussions/reply_section.html", { - "topics": topic_info + "topic": topic_info[0] }) frappe.publish_realtime(