Merge pull request #1959 from bunkerity/dev

Merge branch "dev" into branch "staging"
bunkerity · Jan 29, 2025 · a5bd965 · a5bd965
2 parents 4306015 + d630da7
commit a5bd965
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/ui/app/models/ui_database.py b/src/ui/app/models/ui_database.py
@@ -418,14 +418,15 @@ def get_ui_user_sessions(self, username: str, current_session_id: Optional[str]
         with self._db_session() as session:
             sessions = []
             if current_session_id:
-                current_session_query = session.query(UserSessions).filter_by(user_name=username, id=current_session_id)
-                other_sessions_query = (
+                current_session = session.query(UserSessions).filter_by(user_name=username, id=current_session_id).all()
+                other_sessions = (
                     session.query(UserSessions)
                     .filter_by(user_name=username)
                     .filter(UserSessions.id != current_session_id)
                     .order_by(UserSessions.creation_date.desc())
+                    .all()
                 )
-                query = current_session_query.union_all(other_sessions_query)
+                query = current_session + other_sessions
             else:
                 query = session.query(UserSessions).filter_by(user_name=username).order_by(UserSessions.creation_date.desc())
 

diff --git a/src/ui/app/static/css/overrides.css b/src/ui/app/static/css/overrides.css
@@ -881,6 +881,10 @@ a.courier-prime:hover {
   color: #800000;
 }
 
+.text-teal {
+  color: #20c997;
+}
+
 .blur-overlay {
   position: relative;
 }

diff --git a/src/ui/app/templates/plugin_page.html b/src/ui/app/templates/plugin_page.html
@@ -59,7 +59,7 @@ <h5 class="card-title d-inline don-jose{{ plugin_types[plugin['type']].get('text
                                 <i class='bx bx-{% if up %}up{% else %}down{% endif %}-arrow-circle bx-sm position-absolute top-0 end-0 m-3 text-{% if up %}success{% else %}danger{% endif %}'></i>
                                 <div class="card-header p-1">
                                     <div class="card-title mb-0">
-                                        <h5 class="mb-1 me-2 don-jose">{{ value.get('title', 'STATUS') }}</h5>
+                                        <h5 class="mb-1 me-2 don-jose {{ value.get('title-classes', '') }}">{{ value.get('title', 'STATUS') }}</h5>
                                     </div>
                                 </div>
                                 <div class="card-body position-relative pb-0">
@@ -80,7 +80,7 @@ <h5 class="mb-1 me-2 don-jose">{{ value.get('title', 'STATUS') }}</h5>
                                 <i class='bx bx-{% if key.startswith("info_") %}info-circle{% elif key.startswith("date_") %}calendar{% else %}slider-alt{% endif %} bx-sm position-absolute top-0 end-0 m-3{% if svg_color %} text-{{ svg_color }}{% endif %}'></i>
                                 <div class="card-header p-1">
                                     <div class="card-title mb-0">
-                                        <h5 class="mb-1 me-2 don-jose">{{ value.get("title") }}</h5>
+                                        <h5 class="mb-1 me-2 don-jose {{ value.get('title-classes', '') }}">{{ value.get("title") }}</h5>
                                     </div>
                                 </div>
                                 <div class="card-body position-relative">
@@ -120,7 +120,7 @@ <h5 class="mb-1 me-2 don-jose">{{ value.get("title") }}</h5>
                                 <i class='bx bx-list-{% if key.startswith("top_") %}ol{% else %}ul{% endif %} bx-sm position-absolute top-0 end-0 m-3{% if svg_color %} text-{{ svg_color }}{% endif %}'></i>
                                 <div class="card-header p-1">
                                     <div class="card-title mb-0">
-                                        <h5 class="mb-1 me-2 don-jose">{{ key.replace('_', ' ') }}</h5>
+                                        <h5 class="mb-1 me-2 don-jose {{ value.get('title-classes', '') }}">{{ key.replace('_', ' ') }}</h5>
                                     </div>
                                 </div>
                                 <div class="card-body p-0">