From a7aae591aa9dfb46e4b516bc4edae5b893e87723 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 20 Mar 2023 17:32:58 +0100
Subject: [PATCH 1/2] fix names of titles

---
 ereuse_devicehub/inventory/views.py                         | 2 +-
 ereuse_devicehub/resources/documents/documents.py           | 2 +-
 ereuse_devicehub/templates/ereuse_devicehub/base_site.html  | 2 +-
 .../templates/ereuse_devicehub/user_profile.html            | 6 +++---
 ereuse_devicehub/templates/inventory/device_list.html       | 2 +-
 ereuse_devicehub/templates/inventory/erasure_list.html      | 4 ++--
 ereuse_devicehub/templates/inventory/search.html            | 2 +-
 ereuse_devicehub/templates/workbench/settings.html          | 3 ++-
 ereuse_devicehub/workbench/views.py                         | 2 +-
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index 2526a850..79145f3c 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -1149,7 +1149,7 @@ class ExportsView(View):
         n_computers = len({x.parent for x in erasures} - erasures_host)
 
         params = {
-            'title': 'Erasure Certificate',
+            'title': 'Device Sanitization',
             'erasures': tuple(erasures),
             'url_pdf': '',
             'date_report': '{:%c}'.format(datetime.datetime.now()),
diff --git a/ereuse_devicehub/resources/documents/documents.py b/ereuse_devicehub/resources/documents/documents.py
index d33fd238..b41f3cbd 100644
--- a/ereuse_devicehub/resources/documents/documents.py
+++ b/ereuse_devicehub/resources/documents/documents.py
@@ -138,7 +138,7 @@ class DocumentView(DeviceView):
         url_pdf = boltons.urlutils.URL(flask.request.url)
         url_pdf.query_params['format'] = 'PDF'
         params = {
-            'title': 'Erasure Certificate',
+            'title': 'Device Sanitization',
             'erasures': tuple(erasures()),
             'url_pdf': url_pdf.to_text(),
         }
diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html
index f6dfb1b3..de544d75 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html
@@ -73,7 +73,7 @@
           </li>
           <li>
             <a class="dropdown-item d-flex align-items-center" href="{{ url_for('inventory.device_erasure_list') }}">
-              <i class="bi bi-tag"></i><span>Data Storage Erasures</span>
+              <i class="bi bi-eraser-fill"></i><span>Drives Sanitization</span>
             </a>
           </li>
         </ul>
diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html
index 462fc6ec..e01e6f74 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html
@@ -37,7 +37,7 @@
               <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#profile-change-password">Change Password</button>
             </li>
             <li class="nav-item">
-              <button class="nav-link" data-bs-toggle="tab" data-bs-target="#profile-sanitization-entity">Sanitization Entity</button>
+              <button class="nav-link" data-bs-toggle="tab" data-bs-target="#profile-sanitization-entity">Sanitization Certificate</button>
             </li>
           </ul>
           <div class="tab-content pt-2">
@@ -71,7 +71,7 @@
             </div>
 
             <div class="tab-pane fade pt-3" id="profile-sanitization-entity">
-              <!-- Sanitization Entity datas Form -->
+              <!-- Sanitization Certificate datas Form -->
               <form action="{{ url_for('core.set-sanitization') }}" method="post">
               {% for  f in sanitization_form %}
                 {% if f == sanitization_form.csrf_token %}
@@ -95,7 +95,7 @@
                 <div class="text-center">
                   <button type="submit" class="btn btn-primary">Change sanitization data</button>
                 </div>
-              </form><!-- End Sanitization Entity datas Form -->
+              </form><!-- End Sanitization Certificate datas Form -->
             </div>
 
           </div><!-- End Bordered Tabs -->
diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 7f5ac904..2e2bc7b6 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -256,7 +256,7 @@
                   <li>
                     <a href="javascript:export_file('certificates')" class="dropdown-item">
                       <i class="bi bi-eraser-fill"></i>
-                      Erasure Certificate
+                      Device Sanitization
                     </a>
                   </li>
                 </ul>
diff --git a/ereuse_devicehub/templates/inventory/erasure_list.html b/ereuse_devicehub/templates/inventory/erasure_list.html
index e2154c3e..e2ca389e 100644
--- a/ereuse_devicehub/templates/inventory/erasure_list.html
+++ b/ereuse_devicehub/templates/inventory/erasure_list.html
@@ -6,7 +6,7 @@
   <nav>
     <ol class="breadcrumb">
       <li class="breadcrumb-item"><a href="{{ url_for('inventory.devicelist')}}">Inventory</a></li>
-      <li class="breadcrumb-item active">Erasures disks</li>
+      <li class="breadcrumb-item active">Drive Sanitization</li>
     </ol>
   </nav>
 </div><!-- End Page Title -->
@@ -82,7 +82,7 @@
                   <li>
                     <a href="javascript:export_file('certificates')" class="dropdown-item">
                       <i class="bi bi-eraser-fill"></i>
-                      Erasure Certificate
+                      Device Sanitization
                     </a>
                   </li>
                 </ul>
diff --git a/ereuse_devicehub/templates/inventory/search.html b/ereuse_devicehub/templates/inventory/search.html
index 57f62975..435f99cc 100644
--- a/ereuse_devicehub/templates/inventory/search.html
+++ b/ereuse_devicehub/templates/inventory/search.html
@@ -172,7 +172,7 @@
                   <li>
                     <a href="javascript:export_file('certificates')" class="dropdown-item">
                       <i class="bi bi-eraser-fill"></i>
-                      Erasure Certificate
+                      Device Sanitization
                     </a>
                   </li>
                 </ul>
diff --git a/ereuse_devicehub/templates/workbench/settings.html b/ereuse_devicehub/templates/workbench/settings.html
index d4d591f1..ff21dfa9 100644
--- a/ereuse_devicehub/templates/workbench/settings.html
+++ b/ereuse_devicehub/templates/workbench/settings.html
@@ -20,12 +20,13 @@
           <div class="pt-6 pb-2">
             <div class="row pt-3">
               <div class="col">
+                <h5 class="card-title">Sanitization servers</h5>
                 <form method="post">
                 <table class="table table-hover">
                   <thead>
                     <tr>
                       <th scope="col">PHID</th>
-                      <th scope="col" class="text-center">Erasure Host</th>
+                      <th scope="col" class="text-center">Sanitization Host</th>
                     </tr>
                   </thead>
                   <tbody>
diff --git a/ereuse_devicehub/workbench/views.py b/ereuse_devicehub/workbench/views.py
index 1b81c8f2..25805261 100644
--- a/ereuse_devicehub/workbench/views.py
+++ b/ereuse_devicehub/workbench/views.py
@@ -23,7 +23,7 @@ class SettingsView(GenericMixin):
     decorators = [login_required]
     methods = ['GET', 'POST']
     template_name = 'workbench/settings.html'
-    page_title = "Snapshots"
+    page_title = "Setup"
 
     def dispatch_request(self):
         self.get_context()

From 6a14727f31790b65935f96153e1b422e5c80362c Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 20 Mar 2023 17:34:20 +0100
Subject: [PATCH 2/2] fix names of titles

---
 ereuse_devicehub/resources/documents/documents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ereuse_devicehub/resources/documents/documents.py b/ereuse_devicehub/resources/documents/documents.py
index b41f3cbd..363fda83 100644
--- a/ereuse_devicehub/resources/documents/documents.py
+++ b/ereuse_devicehub/resources/documents/documents.py
@@ -280,7 +280,7 @@ class LotRow(OrderedDict):
         self['Registered in'] = format(lot.created, '%c')
         try:
             self['Description'] = lot.description
-        except:
+        except Exception:
             self['Description'] = ''