Fix Detail page to not use label to get value (#570)

aminalaee · Aug 4, 2023 · f5c1856 · f5c1856
1 parent d843b93
commit f5c1856
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/sqladmin/templates/details.html b/sqladmin/templates/details.html
@@ -20,9 +20,9 @@ <h3 class="card-title">
           </thead>
           <tbody>
             {% for name in model_view._details_prop_names %}
-            {% set name = model_view._column_labels.get(name, name) %}
+            {% set label = model_view._column_labels.get(name, name) %}
             <tr>
-              <td>{{ name }}</td>
+              <td>{{ label }}</td>
               {% set value, formatted_value = model_view.get_detail_value(model, name) %}
               {% if name in model_view._relation_names %}
               {% if is_list( value ) %}

diff --git a/sqladmin/templates/list.html b/sqladmin/templates/list.html
@@ -79,18 +79,18 @@ <h3 class="card-title">{{ model_view.name_plural }}</h3>
             <th class="w-1"><input class="form-check-input m-0 align-middle" type="checkbox" aria-label="Select all" id="select-all"></th>
             <th class="w-1"></th>
             {% for name in model_view._list_prop_names %}
-            {% set name = model_view._column_labels.get(name, name) %}
+            {% set label = model_view._column_labels.get(name, name) %}
             <th>
               {% if name in model_view._sort_fields %}
               {% if request.query_params.get("sortBy") == name and request.query_params.get("sort") == "asc" %}
-              <a href="{{ request.url.include_query_params(sort='desc') }}"><i class="fa-solid fa-arrow-down"></i> {{ name }}</a>
+              <a href="{{ request.url.include_query_params(sort='desc') }}"><i class="fa-solid fa-arrow-down"></i> {{ label }}</a>
               {% elif request.query_params.get("sortBy") == name and request.query_params.get("sort") == "desc" %}
-              <a href="{{ request.url.include_query_params(sort='asc') }}"><i class="fa-solid fa-arrow-up"></i> {{ name }}</a>
+              <a href="{{ request.url.include_query_params(sort='asc') }}"><i class="fa-solid fa-arrow-up"></i> {{ label }}</a>
               {% else %}
-              <a href="{{ request.url.include_query_params(sortBy=name, sort='asc') }}">{{ name }}</a>
+              <a href="{{ request.url.include_query_params(sortBy=name, sort='asc') }}">{{ label }}</a>
               {% endif %}
               {% else %}
-              {{ name }}
+              {{ label }}
               {% endif %}
             </th>
             {% endfor %}