richie 3.1.2__py2.py3-none-any.whl → 3.1.3.dev2__py2.py3-none-any.whl

richie/apps/courses/models/category.py

@@ -71,7 +71,10 @@ class Category(EsIdMixin, BasePageExtension):
         """
         return self.get_reverse_related_page_extensions(
             "course", language=language, include_descendants=include_descendants
-        ).filter(extended_object__node__parent__cms_pages__course__isnull=True)
+        ).filter(
+            extended_object__node__parent__cms_pages__course__isnull=True,
+            is_listed=True,
+        )
 
     def get_blogposts(self, language=None, include_descendants=True):
         """

richie/apps/courses/models/course.py

@@ -180,7 +180,7 @@ class Course(EsIdMixin, BasePageExtension):
     is_listed = models.BooleanField(
         default=True,
         verbose_name=_("is listed"),
-        help_text=_("Tick if you want the course to be visible on the search page."),
+        help_text=_("Tick if you want the course to be visible."),
     )
 
     is_self_paced = models.BooleanField(

richie/apps/courses/models/organization.py

@@ -147,7 +147,10 @@ class Organization(EsIdMixin, BasePageExtension):
         """
         return self.get_reverse_related_page_extensions(
             "course", language=language
-        ).filter(extended_object__node__parent__cms_pages__course__isnull=True)
+        ).filter(
+            extended_object__node__parent__cms_pages__course__isnull=True,
+            is_listed=True,
+        )
 
     def get_persons(self, language=None):
         """

richie/apps/courses/models/person.py

@@ -50,7 +50,10 @@ class Person(EsIdMixin, BasePageExtension):
         """
         return self.get_reverse_related_page_extensions(
             "course", language=language
-        ).filter(extended_object__node__parent__cms_pages__course__isnull=True)
+        ).filter(
+            extended_object__node__parent__cms_pages__course__isnull=True,
+            is_listed=True,
+        )
 
     def get_blogposts(self, language=None):
         """

richie/apps/courses/models/program.py

@@ -14,6 +14,7 @@ from ...core.fields.duration import CompositeDurationField
 from ...core.models import BasePageExtension
 from .. import defaults
 from .category import Category, CategoryPluginModel
+from .course import Course, CoursePluginModel
 from .organization import Organization, OrganizationPluginModel
 from .person import Person, PersonPluginModel
 
@@ -114,6 +115,19 @@ class Program(BasePageExtension):
             Person, PersonPluginModel, language=language
         )
 
+    def get_courses(self, language=None):
+        """
+        Return the courses linked to the program via a course plugin in any of the
+        placeholders on the program detail page, ranked by their `path` to respect
+        the order in the courses tree.
+        The courses are filtered to only include those that are listed and published.
+        """
+        courses = self.get_direct_related_page_extensions(
+            Course, CoursePluginModel, language=language
+        ).filter(is_listed=True)
+
+        return [course for course in courses if course.check_publication(language)]
+
     def save(self, *args, **kwargs):
         """
         Enforce validation each time an instance is saved

richie/apps/courses/templates/courses/cms/program_detail.html

@@ -191,7 +191,7 @@
     </div>
     {% endif %}
 
-    {% if current_page.publisher_is_draft or not current_page|is_empty_placeholder:"program_courses" %}
+    {% if current_page.publisher_is_draft or not current_page|is_empty_placeholder:"program_courses" or current_page.program.get_courses|length > 0 %}
         <div class="program-detail__courses program-detail__block">
             <div class="program-detail__row">
                 <section class="course-glimpse-list">
@@ -199,7 +199,13 @@
                         <h2 class="program-detail__title">{% trans "Related courses" %}</h2>
                     </div>
                     <div class="course-glimpse-list__content">
-                        {% placeholder "program_courses" %}
+                        {% if request.toolbar.edit_mode_active %}
+                            {% placeholder "program_courses" %}
+                        {% else %}
+                            {% for course in current_page.program.get_courses %}
+                                {% include "courses/cms/fragment_course_glimpse.html" with course=course header_level=3 %}
+                            {% endfor %}
+                        {% endif %}
                     </div>
                 </section>
             </div>

{richie-3.1.2.dist-info → richie-3.1.3.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: richie
-Version: 3.1.2
+Version: 3.1.3.dev2
 Summary: A CMS to build learning portals for open education
 Author-email: "Open FUN (France Université Numérique)" <fun.dev@fun-mooc.fr>
 License: MIT License

{richie-3.1.2.dist-info → richie-3.1.3.dev2.dist-info}/RECORD

@@ -1009,12 +1009,12 @@ richie/apps/courses/migrations/0039_program_duration_program_effort_program_pric
 richie/apps/courses/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 richie/apps/courses/models/__init__.py,sha256=TKx_JE0qeWMcDmHjk_NfDb_8CKIxXPgxMHzD7k6IMeA,323
 richie/apps/courses/models/blog.py,sha256=q7AHQDYWB2uHeoGJ1nePKjZoPWeLg2bPSrmhudAupcc,3450
-richie/apps/courses/models/category.py,sha256=M24o2trqM1ikDiD11igu2n2cdKzARsP6MsOXr2Z3jQQ,7305
-richie/apps/courses/models/course.py,sha256=USgfHPg2v_J0iRsEPh3dG1MOp9vTI10eh-9BOSewkps,47018
+richie/apps/courses/models/category.py,sha256=OIqqvGOwQlgE7oI6sUPNBD4X6iRNjd7yfXtoGnxh7fI,7356
+richie/apps/courses/models/course.py,sha256=xmZ13_9Sbr_kt6ey5JA8jAuW5PJrtrgmjt6RHfur2Yo,46999
 richie/apps/courses/models/menuentry.py,sha256=ABF8wEhyZ9T45YXhBCUDcK7Up8N5HZ9XB8R824EUSoI,1393
-richie/apps/courses/models/organization.py,sha256=EToxJop9DRxx_grXw8OruSxq_hNOVeJPmt2wbRwZvJs,8664
-richie/apps/courses/models/person.py,sha256=_tQ3tMCwetvWwu4vwOOUOjQ_kED0FC27pP4ziU16lE4,2945
-richie/apps/courses/models/program.py,sha256=SYDZ7A5838huLILo8I93I3t5115PI6O7b9aRG_xlB3U,4487
+richie/apps/courses/models/organization.py,sha256=slRhrk_LBE4sMF3LQ9tuzbKmPnDhXaas7YvUsFWE5qU,8715
+richie/apps/courses/models/person.py,sha256=tjKShF35iQlsESODWFDwMs22a7-Lyawzz6xBs5u5nGQ,2996
+richie/apps/courses/models/program.py,sha256=JdG51Xnw0jHCBNFzPclT-YTFOhh0ZdGgijlp-kBDOFI,5125
 richie/apps/courses/models/role.py,sha256=BWUhE-nE22nqaN0tdiFdutkyjcE4MEz5Es6fXOzo-9c,3585
 richie/apps/courses/settings/__init__.py,sha256=P168dzNPmOMdjbSCiuUz6V_UkIRNSrrOG03XO_YWZgU,22681
 richie/apps/courses/settings/mixins.py,sha256=tVkingrXH9Wykz6ybSCoT4AzXZV_ott6zv77wHjkpvc,526
@@ -1039,7 +1039,7 @@ richie/apps/courses/templates/courses/cms/organization_detail.html,sha256=5x0zHV
 richie/apps/courses/templates/courses/cms/organization_list.html,sha256=nRvC9OPC1jDhIvJW8le6IVqHt7DWnO0Apedve4P-fTU,1129
 richie/apps/courses/templates/courses/cms/person_detail.html,sha256=UbZP4eJCE2Jpb6Ppq0gQgYEVv2fR9RSRC9l4wX9wn64,9654
 richie/apps/courses/templates/courses/cms/person_list.html,sha256=lxF2rbS1LN7kucs3RsN5_lIDyhafYEFFchayZlUpeq0,926
-richie/apps/courses/templates/courses/cms/program_detail.html,sha256=wMGh1-60jMiBjzqZJ9Oc_M19yzKuWKwKYD719tavkiE,12503
+richie/apps/courses/templates/courses/cms/program_detail.html,sha256=HFg2qd8-XnTXcBaMbBsLwkl7rfMoB4pwbwGeFg1Gg2A,12936
 richie/apps/courses/templates/courses/cms/program_list.html,sha256=m2zfxRM9EpCo1NX_O2TV1KmypSIxuq4pYW_sv3Z6JD8,1673
 richie/apps/courses/templates/courses/plugins/blogpost.html,sha256=fCUFoemD9FeZKzHtcnHz9VgUgveTvkpoVrw0bUyQR1M,221
 richie/apps/courses/templates/courses/plugins/category_plugin.html,sha256=W6oFmRzhRL1KO55I5KNH7xjwBZJiqWHhaLOgMPJTSZA,215
@@ -2483,9 +2483,9 @@ richie/static/richie/js/build/99870.90b7d4762235189dc2fd.index.js,sha256=4CC19Rd
 richie/static/richie/js/build/99895.90b7d4762235189dc2fd.index.js,sha256=Pi0STMa7ldUMZ202X_lr0p_--hmkab2RjmSwLTNqKKo,2570
 richie/static/richie/js/build/99953.90b7d4762235189dc2fd.index.js,sha256=OWoLPJnHrmvF3HBQPgXooAGo5E0yJpJ7QTFHFghJpI8,135
 richie/static/richie/js/build/index.js,sha256=_HdHfK6rZ3ETFe_WF0NBm8AsXDAgbSDYxIUYj0RjuwM,1332827
-richie-3.1.2.dist-info/licenses/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
-richie-3.1.2.dist-info/METADATA,sha256=UtWSBeJJMadRaBczdUI1A-myixgzu9L2FgJpjmbw9E4,7028
-richie-3.1.2.dist-info/WHEEL,sha256=egKm5cKfE6OqlHwodY8Jjp4yqZDBXgsj09UsV5ojd_U,109
-richie-3.1.2.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
-richie-3.1.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-richie-3.1.2.dist-info/RECORD,,
+richie-3.1.3.dev2.dist-info/licenses/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
+richie-3.1.3.dev2.dist-info/METADATA,sha256=-Ca42dkUjsS7PxIfP_8bdeEeEXPhf5ViLScDOYr_qeo,7033
+richie-3.1.3.dev2.dist-info/WHEEL,sha256=egKm5cKfE6OqlHwodY8Jjp4yqZDBXgsj09UsV5ojd_U,109
+richie-3.1.3.dev2.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
+richie-3.1.3.dev2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+richie-3.1.3.dev2.dist-info/RECORD,,