fix: conflicts

community/www/batch/learn.html

@@ -27,14 +27,9 @@
         {% if membership %}
         {{ pagination(prev_url, next_url) }}
         {% endif %}
-
-        {% set title = lesson.title + " - " + course.title %}
-        {% set condition = membership or is_instructor %}
-        {{ widgets.DiscussionMessage(doctype="Lesson", docname=lesson.name,
-          title=title, condition=condition, button_name="Start Learning",
-          redirect_to="/courses/" + course.name) }}
       </div>
     </div>
+    {{ Discussions() }}
   </div>
 </div>
 {% endblock %}
@@ -96,7 +91,7 @@
       Next
       <img class="ml-2" src="/assets/community/icons/side-arrow-white.svg">
     </a>
-    {% elif course.enable_certification  %}
+    {% elif course.enable_certification %}
     <div class="button is-primary {% if course.get_course_progress() != 100 %} hide {% endif %}" id="certification">
       Get Certificate
     </div>
@@ -106,6 +101,15 @@
 </div>
 {% endmacro %}
 
+{% macro Discussions() %}
+{% set is_instructor = frappe.session.user == course.instructor %}
+{% set title = lesson.title + " - " + course.title %}
+{% set condition = is_instructor if is_instructor else membership %}
+{{ widgets.DiscussionMessage(doctype="Lesson", docname=lesson.name,
+          condition=condition, button_name="Start Learning",
+          redirect_to="/courses/" + course.name) }}
+{% endmacro %}
+
 {%- block script %}
 {{ super() }}
 

community/www/discussions/discussion.html

@@ -1,16 +0,0 @@
-{% extends "templates/base.html" %}
-{% block title %}{{ thread.title }}{% endblock %}
-{% block head_include %}
-<style>
-</style>
-{% endblock %}
-
-{% block content %}
-<div class="common-page-style">
-  <div class="container">
-    {{ widgets.BreadCrumb(thread=thread) }}
-    <div class="course-home-headings">{{ thread.title }}</div>
-    {{ widgets.DiscussionMessage(thread=thread.name) }}
-  </div>
-</div>
-{% endblock %}

community/www/discussions/discussion.py

@@ -1,18 +0,0 @@
-import frappe
-
-def get_context(context):
-    context.no_cache = 1
-
-    try:
-        thread_name = frappe.form_dict["discussion"]
-    except KeyError:
-        redirect_to_discussions()
-
-    context.thread = frappe.db.get_value("Discussion Thread", thread_name, ["name", "title"], as_dict=True)
-
-    if not len(context.thread):
-        redirect_to_discussions
-
-def redirect_to_discussions():
-    frappe.local.flags.redirect_location = "/discussions"
-    raise frappe.Redirect

community/www/discussions/index.html

@@ -1,65 +0,0 @@
-{% extends "templates/base.html" %}
-{% block title %}{{ 'Discussions' }}{% endblock %}
-{% block head_include %}
-<style>
-</style>
-{% endblock %}
-
-{% block content %}
-<div class="common-page-style">
-  <div class="container">
-    <div class="courses-header">
-      <span>{{_('Discussions')}}</span>
-      <div id="new-topic" class="button is-primary pull-right">
-        <img src="/assets/community/icons/small-add.svg">
-        Start a Discussion</div>
-    </div>
-    <div class="card-divider-dark"></div>
-    {% if threads | length %}
-    <div class="cards-parent">
-      {% for thread in threads %}
-      <div class="common-card-style thread-card">
-        <div class="course-card-title">{{ thread.title }}</div>
-        <div class="card-divider"></div>
-        <div>
-          <span class="course-student-count">
-            <span class="mr-4">
-              <img class="icon-background" src="/assets/community/icons/message.svg" />
-              {{ thread.message_count }}
-            </span>
-            <span class="mr-4">
-              <img class="icon-background" src="/assets/community/icons/user.svg" />
-              {{ thread.member_count }}
-            </span>
-          </span>
-        </div>
-        <a class="stretched-link" href="/discussions/{{ thread.name }}"></a>
-      </div>
-      {% endfor %}
-    </div>
-    {% else %}
-    <div class="text-center font-weight-bold mt-5">
-      No discussions yet.
-    </div>
-    {% endif %}
-  </div>
-</div>
-
-<!-- New Topic Modal -->
-<div class="modal fade discussion-modal" id="discussion-modal" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <div class="course-home-headings modal-headings">Start a Discussion</div>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        {{ widgets.DiscussionComment() }}
-      </div>
-    </div>
-  </div>
-</div>
-
-{% endblock %}

community/www/discussions/index.js

@@ -1,14 +0,0 @@
-frappe.ready(() => {
-  $("#new-topic").click((e) => {
-    show_new_topic_modal(e);
-  })
-})
-
-var show_new_topic_modal = (e) => {
-  e.preventDefault();
-  if (frappe.session.user == "Guest") {
-    window.location.href = `/login?redirect-to=/discussions/`;
-    return;
-  }
-  $("#discussion-modal").modal("show");
-}

community/www/discussions/index.py

@@ -1,17 +0,0 @@
-import frappe
-
-def get_context(context):
-    context.threads = get_threads()
-
-def get_threads():
-    threads = frappe.get_all("Discussion Thread", fields=["name", "title"])
-    for thread in threads:
-        messages = frappe.get_all("Discussion Message",
-                        {
-                            "thread": thread.name
-                        },
-                        ["owner"],
-                        as_list=True)
-        thread.message_count = len(messages)
-        thread.member_count = len(set(messages))
-    return threads