Merge pull request #82 from OpenLXP/comp_migrations

competency migration
OpenLXP · Oct 28, 2024 · ec45274 · ec45274
2 parents 8c90d36 + 2bb8fd9
commit ec45274
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 4 deletions.
diff --git a/app/configurations/migrations/0010_merge_20241026_0049.py b/app/configurations/migrations/0010_merge_20241026_0049.py
@@ -0,0 +1,14 @@
+# Generated by Django 4.2.16 on 2024-10-26 00:49
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('configurations', '0007_courseinformationmapping_course_time_and_more'),
+        ('configurations', '0009_alter_xdsuiconfiguration_ui_logo'),
+    ]
+
+    operations = [
+    ]
diff --git a/app/es_api/tests/test_views_unit.py b/app/es_api/tests/test_views_unit.py
@@ -199,6 +199,12 @@ def test_search_derived_with_reference(self):
 
 @tag('unit')
 class SearchCompetencyTests(APITestCase):
+
+    def setUp(self):
+        settings_manager = override_settings(SECURE_SSL_REDIRECT=False)
+        settings_manager.enable()
+        self.addCleanup(settings_manager.disable)
+
     def test_search_competency_no_reference(self):
         """
         Test that the /es-api/ endpoint sends an HTTP error when no

diff --git a/app/static/admin_interface/css/admin-interface.css b/app/static/admin_interface/css/admin-interface.css
@@ -413,14 +413,19 @@
     border-radius: var(--admin-interface-module-border-radius);
 }
 
+.admin-interface .module.filtered .changelist-filter-clear-container {
+    margin: 12px 0;
+}
+
 .admin-interface .module.filtered #changelist-filter h3#changelist-filter-clear {
-    margin-bottom: 0;
+    margin-top: 5px;
+    margin-bottom: 10px;
 }
 
 .admin-interface .module.filtered #changelist-filter .changelist-filter-clear a {
-    font-size: 13px;
+    font-size: 12px;
     margin: .3em 0;
-    padding: 0 15px;
+    padding: 0 15px 0 32px;
 }
 
 .admin-interface .module.filtered #changelist-filter .changelist-filter-clear a:focus,
@@ -441,7 +446,8 @@
     text-decoration: none;
 }
 
-.admin-interface.list-filter-highlight .module.filtered #changelist-filter h3.active {
+.admin-interface.list-filter-highlight .module.filtered #changelist-filter h3.active,
+.admin-interface.list-filter-highlight .module.filtered #changelist-filter summary.active {
     font-weight: bold;
 }
 
@@ -473,6 +479,19 @@
     color: var(--admin-interface-generic-link-hover-color);
 }
 
+.admin-interface .module.filtered #changelist-filter a,
+.admin-interface .module.filtered #changelist-filter a:link,
+.admin-interface .module.filtered #changelist-filter a:visited {
+    color: var(--admin-interface-generic-link-color);
+    text-decoration: none;
+}
+
+.admin-interface .module.filtered #changelist-filter a:hover,
+.admin-interface .module.filtered #changelist-filter a:active {
+    color: var(--admin-interface-generic-link-hover-color);
+    text-decoration: none;
+}
+
 /* begin fix issue #11 - Inline border bottom should not be rounded */
 .admin-interface .module h2,
 .admin-interface.dashboard .module caption,

diff --git a/app/static/admin_interface/css/changelist.css b/app/static/admin_interface/css/changelist.css
@@ -46,4 +46,7 @@
 .admin-interface #changelist #changelist-form table tbody th,
 .admin-interface #changelist #changelist-form table tbody td {
     white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    max-width: min(400px, 30vw);
 }
diff --git a/app/static/admin_interface/css/list-filter-dropdown.css b/app/static/admin_interface/css/list-filter-dropdown.css
@@ -8,6 +8,7 @@ list-filter-dropdown
 }
 
 .admin-interface #changelist-filter h2 + .list-filter-dropdown,
+.admin-interface #changelist-filter #changelist-filter-extra-actions + .list-filter-dropdown,
 .admin-interface #changelist-filter .list-filter-dropdown + .list-filter-dropdown {
     margin-top: 5px;
 }

diff --git a/app/static/admin_interface/css/list-filter.css b/app/static/admin_interface/css/list-filter.css
@@ -13,6 +13,14 @@
     }
 }
 
+.admin-interface .module.filtered #changelist-filter h2#changelist-filter-header {
+    margin-bottom: 0;
+}
+
+.admin-interface .module.filtered #changelist-filter h2#changelist-filter-header + details {
+    margin-top: 12px;
+}
+
 .admin-interface .module.filtered #changelist-filter h2 {
     font-size: 11px;
     padding: 10px 15px;
@@ -26,3 +34,10 @@
     margin-top: 12px;
     margin-bottom: 12px;
 }
+
+/* fix summary shift when expanding/collapsing list filter */
+.admin-interface .module.filtered #changelist-filter details > summary::before {
+    display: inline-block;
+    width: 14px;
+    text-align: center;
+}
diff --git a/app/static/admin_interface/css/nav-sidebar.css b/app/static/admin_interface/css/nav-sidebar.css
@@ -76,3 +76,12 @@
         max-width: calc(100% - 360px);
     }
 }
+
+/* Hide the app element when all its models filtered-out (hidden) by quick-search. */
+.admin-interface #nav-sidebar .module[class^="app-"]:has([class^="model-"][style="display: none;"]) {
+    display: none;
+}
+
+.admin-interface #nav-sidebar .module[class^="app-"]:has([class^="model-"]:not([style="display: none;"])) {
+    display: block !important;
+}