Merge pull request #63 from CESNET/develop

This PR bumps the project version to 1.1.3, removes debugging prints from the admin update routine, and adds a configurable footer menu to the default template.

Remove debug print statements in update_set_org
Introduce a new inject_footer_menu context processor and render footer_menu in the base layout
Bump application version to 1.1.3 and update CHANGELOG

Author: jirivrany

README.md

@@ -59,6 +59,7 @@ The REST API is documented using Swagger (OpenAPI). After installing and running
 
 
 ## Change Log
+- 1.1.3 - introduced configurable footer menu for links in bottom of the default template
 - 1.1.2 - minor security updates (removed unused JS files), setup.py now reads dependencies from requirements.txt
 - 1.1.1 - Machine API Key rewrited. 
     - API keys for machines are now tied to one of the existing users. If there is a need to have API access for machine, first create service user, and set the access rights. Then create machine key as Admin and assign it to this user. 

flowapp/__about__.py

@@ -1 +1 @@
-__version__ = "1.1.2"
+__version__ = "1.1.3"

flowapp/templates/layouts/default.html

@@ -94,7 +94,22 @@
             </li>
         </ul>
     </nav>
-    <p class="position-fixed bottom-0 end-0 form-text p-2 me-2">ExaFS {{ session['app_version'] }}</p>
+    <footer class="bg-light text-muted mt-5 pt-4 border-top">
+      <div class="container">
+        <div class="row justify-content-between align-items-center">
+          <div class="col-md-auto mb-2 mb-md-0">
+            <nav class="nav">
+              {% for item in footer_menu %}
+                <a class="nav-link px-2" href="{{ url_for(item.url) }}">{{ item.name }}</a>
+              {% endfor %}
+            </nav>
+          </div>
+          <div class="col-md-auto text-end small">
+            ExaFS {{ session['app_version'] }}
+          </div>
+        </div>
+      </div>
+    </footer>
 
     <script type="text/javascript" src="/static/js/ip_context.js"></script>  
     <script type="text/javascript" src="/static/js/enable_tooltips.js"></script>

flowapp/utils/app_factory.py

@@ -108,6 +108,11 @@ def inject_dashboard():
         """Inject dashboard config to templates."""
         return {"dashboard": app.config.get("DASHBOARD")}
 
+    @app.context_processor
+    def inject_footer_menu():
+        """Inject main menu config to templates."""
+        return {"footer_menu": app.config.get("FOOTER_MENU", [])}
+
     return app
 
 

flowapp/views/admin.py

@@ -672,7 +672,6 @@ def update_set_org():
     user_with_multiple_orgs = {}
     for model in models:
         data_records = model.query.filter(model.org_id == 0).all()
-        print(f"Found {len(data_records)} records with org_id NULL in {model.__name__}")
         # Loop through each flowspec record and update org_id based on the user's organization
         updated = 0
         for row in data_records:
@@ -683,7 +682,6 @@ def update_set_org():
                     row.org_id = user_org.id
                     updated += 1
             else:
-                print(f"User {row.user.email} has multiple organizations")
                 user_with_multiple_orgs[row.user.email] = [org.name for org in orgs]
         # Commit the changes
         try: