Merge pull request pallets-eco#2198 from caffeinatedMike/fix-boostrap4-menulink-target

mrjoes · web-flow · commit 93193e088f67 · 2021-12-06T13:03:00.000-05:00
Update menu_links rendering bug and fontawesome icon rendering
diff --git a/flask_admin/model/typefmt.py b/flask_admin/model/typefmt.py
@@ -36,8 +36,8 @@ def bool_formatter(view, value):
             Value to check
     """
     glyph = 'ok-circle' if value else 'minus-sign'
-    fa = 'fas fa-check-circle' if value else 'far fa-circle'
-    return Markup('<span class="%s glyphicon glyphicon-%s icon-%s"></span>' % (fa, glyph, glyph))
+    fa = 'fa-check-circle' if value else 'fa-minus-circle'
+    return Markup('<span class="fa %s glyphicon glyphicon-%s icon-%s"></span>' % (fa, glyph, glyph))
 
 
 def list_formatter(view, values):
diff --git a/flask_admin/templates/bootstrap4/admin/layout.html b/flask_admin/templates/bootstrap4/admin/layout.html
@@ -80,7 +80,8 @@
     {% set class_name = item.get_class_name() %}
     {% if item.is_accessible() and item.is_visible() %}
       <li{% if class_name %} class="{{ class_name }}"{% endif %}>
-        <a class="nav-link" href="{{ item.get_url() }}">{{ menu_icon(item) }}{{ item.name }}</a>
+        <a class="nav-link" href="{{ item.get_url() }}"{% if item.target %} target="{{ item.target }}"{% endif %}>
+          {{ menu_icon(item) }}{{ item.name }}</a>
       </li>
     {% endif %}
   {% endfor %}
