Merge pull request #1 from danidee10/danidee10-odoo-patch-1

imp [web]: Fix inconsistencies between custom button icons in Form views and List View buttons
odoo · Sep 25, 2016 · 5253654 · 5253654
2 parents 9ca904e + adbfee7
commit 5253654
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
@@ -810,8 +810,9 @@
 <button t-name="ListView.row.button" type="button"
         t-att-title="widget.string" t-att-disabled="disabled || undefined"
         t-att-class="disabled ? 'oe_list_button_disabled' : ''"
-        ><img t-attf-src="#{prefix}/web/static/src/img/icons/#{widget.icon}.png"
-        t-att-alt="widget.string"/></button>
+        ><t t-if="!widget.icon.indexOf('fa-') == 0"><t t-if="!/\//.test(widget.icon)"><img t-attf-src="#{prefix}/web/static/src/img/icons/#{widget.icon}.png" /></t></t>
+        <t t-if="/\//.test(widget.icon)"><img t-attf-src="#{widget.icon}" /></t>
+        <i t-if="widget.icon.indexOf('fa-') == 0" t-attf-class="fa #{widget.icon}" t-att-title="widget.string"/></button>
 <t t-extend="ListView.row">
     <!-- adds back padding to row being rendered after edition, if necessary
          (if not deletable add back padding), otherwise the row being added is