From b0500b68585b87dcd6e07275fdafed8e50bc40f0 Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Thu, 30 Jan 2020 10:13:53 +0000
Subject: [PATCH] [FIX] web: file upload progress bar should not conflict with
 the field ProgressBar

closes odoo/odoo#44255

Signed-off-by: Lucas Perais (lpe) <lpe@odoo.com>
---
 addons/web/static/src/js/views/file_upload_progress_bar.js | 2 +-
 addons/web/static/src/xml/file_upload_progress_bar.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/views/file_upload_progress_bar.js b/addons/web/static/src/js/views/file_upload_progress_bar.js
index 95b99a831c0..7eea38dd8f6 100644
--- a/addons/web/static/src/js/views/file_upload_progress_bar.js
+++ b/addons/web/static/src/js/views/file_upload_progress_bar.js
@@ -6,7 +6,7 @@ const Dialog = require('web.Dialog');
 const Widget = require('web.Widget');
 
 const ProgressBar = Widget.extend({
-    template: 'web.ProgressBar',
+    template: 'web.FileUploadProgressBar',
 
     events: {
         'click .o_upload_cross': '_onClickCross',
diff --git a/addons/web/static/src/xml/file_upload_progress_bar.xml b/addons/web/static/src/xml/file_upload_progress_bar.xml
index 8d2c39e13bf..bdba37a64ea 100644
--- a/addons/web/static/src/xml/file_upload_progress_bar.xml
+++ b/addons/web/static/src/xml/file_upload_progress_bar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates>
 
-<div t-name="web.ProgressBar" class="o_file_upload_progress_bar">
+<div t-name="web.FileUploadProgressBar" class="o_file_upload_progress_bar">
     <div class="o_file_upload_progress_bar_value"/>
     <span class="o_upload_cross fa fa-times-circle" title="Cancel Upload" aria-label="Cancel Upload"/>
 </div>