From c212cfe8992292f57acacd809de26e1817533095 Mon Sep 17 00:00:00 2001
From: Thanh Dodeur <tso@odoo.com>
Date: Fri, 5 Apr 2019 08:11:26 +0000
Subject: [REF] *: removes datas_fname from ir.attachment

This commit removes the field `datas_fname` from `ir.attachment` as
it was unnecessary and most of the time the duplicate of `name` or
`url`.

Task #1909865

closes odoo/odoo#32976

Signed-off-by: Martin Geubelle (mge) <mge@openerp.com>
---
 addons/website/data/website_data.xml | 147 ++++++++++++-----------------------
 1 file changed, 49 insertions(+), 98 deletions(-)

(limited to 'addons/website/data/website_data.xml')

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 737ff819de8..1d50c7bf704 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -173,136 +173,119 @@
         <!-- Pre loaded images -->
         <record id="website.business_conference" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">business_conference</field>
-            <field name="datas_fname">business_conference.jpg</field>
+            <field name="name">business_conference.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">binary</field>
             <field name="datas" type="base64" file="website/static/src/img/library/business_conference.jpg"/>
         </record>
         <record id="website.library_image_01" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 01</field>
-            <field name="datas_fname">bridge.jpg</field>
+            <field name="name">bridge.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/bridge.jpg</field>
         </record>
         <record id="website.library_image_02" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 02</field>
-            <field name="datas_fname">deliver.jpg</field>
+            <field name="name">deliver.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/deliver.jpg</field>
         </record>
         <record id="website.library_image_03" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 03</field>
-            <field name="datas_fname">clock.jpg</field>
+            <field name="name">clock.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/clock.jpg</field>
         </record>
         <record id="website.library_image_04" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 04</field>
-            <field name="datas_fname">manufacturing.jpg</field>
+            <field name="name">manufacturing.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/manufacturing.jpg</field>
         </record>
         <record id="website.library_image_05" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 05</field>
-            <field name="datas_fname">compass.jpg</field>
+            <field name="name">compass.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/compass.jpg</field>
         </record>
         <record id="website.library_image_06" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 06</field>
-            <field name="datas_fname">gift.jpg</field>
+            <field name="name">gift.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/gift.jpg</field>
         </record>
         <record id="website.library_image_07" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 07</field>
-            <field name="datas_fname">mobile_device.jpg</field>
+            <field name="name">mobile_device.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/mobile_device.jpg</field>
         </record>
         <record id="website.library_image_08" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 08</field>
-            <field name="datas_fname">mobile.jpg</field>
+            <field name="name">mobile.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/mobile.jpg</field>
         </record>
         <record id="website.library_image_09" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 09</field>
-            <field name="datas_fname">office.jpg</field>
+            <field name="name">office.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/office.jpg</field>
         </record>
         <record id="website.library_image_10" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 10</field>
-            <field name="datas_fname">ice_coffe.jpg</field>
+            <field name="name">ice_coffe.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/ice_coffe.jpg</field>
         </record>
         <record id="website.library_image_11" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 11</field>
-            <field name="datas_fname">rocket.jpg</field>
+            <field name="name">rocket.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/rocket.jpg</field>
         </record>
         <record id="website.library_image_12" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 12</field>
-            <field name="datas_fname">sell.jpg</field>
+            <field name="name">sell.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/sell.jpg</field>
         </record>
         <record id="website.library_image_13" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 13</field>
-            <field name="datas_fname">shop.jpg</field>
+            <field name="name">shop.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/shop.jpg</field>
         </record>
         <record id="website.library_image_14" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 14</field>
-            <field name="datas_fname">sign.jpg</field>
+            <field name="name">sign.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/sign.jpg</field>
         </record>
         <record id="website.library_image_15" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 15</field>
-            <field name="datas_fname">sweet.jpg</field>
+            <field name="name">sweet.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/sweet.jpg</field>
         </record>
         <record id="website.library_image_16" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Library Image 16</field>
-            <field name="datas_fname">wine.jpg</field>
+            <field name="name">wine.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/wine.jpg</field>
@@ -311,72 +294,63 @@
         <!-- Website Builder Background Images -->
         <record id="website.s_background_image_01" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Background Image 01</field>
-            <field name="datas_fname">s_background_image_01.jpg</field>
+            <field name="name">s_background_image_01.jpg</field>
             <field name="type">url</field>
             <field name="res_model">ir.ui.view</field>
             <field name="url">/website/static/src/img/backgrounds/peak.jpg</field>
         </record>
         <record id="website.s_background_image_02" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Background Image 02</field>
-            <field name="datas_fname">s_background_image_02.jpg</field>
+            <field name="name">s_background_image_02.jpg</field>
             <field name="type">url</field>
             <field name="res_model">ir.ui.view</field>
             <field name="url">/website/static/src/img/backgrounds/la.jpg</field>
         </record>
         <record id="website.s_background_image_03" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Background Image 03</field>
-            <field name="datas_fname">s_background_image_03.jpg</field>
+            <field name="name">s_background_image_03.jpg</field>
             <field name="type">url</field>
             <field name="res_model">ir.ui.view</field>
             <field name="url">/website/static/src/img/backgrounds/panama-sky.jpg</field>
         </record>
         <record id="website.s_background_image_04" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Background Image 04</field>
-            <field name="datas_fname">s_background_image_04.jpg</field>
+            <field name="name">s_background_image_04.jpg</field>
             <field name="type">url</field>
             <field name="res_model">ir.ui.view</field>
             <field name="url">/website/static/src/img/backgrounds/cubes.jpg</field>
         </record>
         <record id="website.s_background_image_05" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Background Image 05</field>
-            <field name="datas_fname">s_background_image_05.jpg</field>
+            <field name="name">s_background_image_05.jpg</field>
             <field name="type">url</field>
             <field name="res_model">ir.ui.view</field>
             <field name="url">/website/static/src/img/backgrounds/building-profile.jpg</field>
         </record>
         <record id="website.s_background_image_06" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Background Image 06</field>
-            <field name="datas_fname">s_background_image_06.jpg</field>
+            <field name="name">s_background_image_06.jpg</field>
             <field name="type">url</field>
             <field name="res_model">ir.ui.view</field>
             <field name="url">/website/static/src/img/backgrounds/type.jpg</field>
         </record>
         <record id="website.s_background_image_07" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Background Image 07</field>
-            <field name="datas_fname">s_background_image_07.jpg</field>
+            <field name="name">s_background_image_07.jpg</field>
             <field name="type">url</field>
             <field name="res_model">ir.ui.view</field>
             <field name="url">/website/static/src/img/backgrounds/people.jpg</field>
         </record>
         <record id="website.s_background_image_08" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Background Image 08</field>
-            <field name="datas_fname">s_background_image_08.jpg</field>
+            <field name="name">s_background_image_08.jpg</field>
             <field name="type">url</field>
             <field name="res_model">ir.ui.view</field>
             <field name="url">/website/static/src/img/backgrounds/city.jpg</field>
         </record>
         <record id="website.s_background_image_09" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Website Background Image 09</field>
-            <field name="datas_fname">s_background_image_09.jpg</field>
+            <field name="name">s_background_image_09.jpg</field>
             <field name="type">url</field>
             <field name="res_model">ir.ui.view</field>
             <field name="url">/website/static/src/img/backgrounds/sails.jpg</field>
@@ -385,162 +359,139 @@
         <!-- Snippets' Default Images (to be replaced by themes) -->
         <record id="website.s_cover_default_image" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Cover Snippet - Default Image</field>
-            <field name="datas_fname">s_cover_default_image.jpg</field>
+            <field name="name">s_cover_default_image.jpg</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_cover.jpg</field>
         </record>
         <record id="website.s_quotes_carousel_demo_image_1" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Quotes Carousel Snippet - Demo Image 1</field>
-            <field name="datas_fname">s_quotes_carousel_image_01.jpg</field>
+            <field name="name">s_quotes_carousel_image_01.jpg</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_quotes_carousel_1.jpg</field>
         </record>
         <record id="website.s_quotes_carousel_demo_image_2" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Quotes Carousel Snippet - Demo Image 2</field>
-            <field name="datas_fname">s_quotes_carousel_image_02.jpg</field>
+            <field name="name">s_quotes_carousel_image_02.jpg</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_quotes_carousel_2.jpg</field>
         </record>
         <record id="website.s_quotes_carousel_demo_image_3" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Quotes Carousel Snippet - Demo Image 3</field>
-            <field name="datas_fname">s_quotes_carousel_image_3.png</field>
+            <field name="name">s_quotes_carousel_image_3.png</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_team_member_3.png</field>
         </record>
         <record id="website.s_quotes_carousel_demo_image_4" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Quotes Carousel Snippet - Demo Image 4</field>
-            <field name="datas_fname">s_quotes_carousel_image_4.png</field>
+            <field name="name">s_quotes_carousel_image_4.png</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_team_member_2.png</field>
         </record>
         <record id="website.s_quotes_carousel_demo_image_5" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Quotes Carousel Snippet - Demo Image 5</field>
-            <field name="datas_fname">s_quotes_carousel_image_5.png</field>
+            <field name="name">s_quotes_carousel_image_5.png</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_team_member_4.png</field>
         </record>
         <record id="website.s_image_text_default_image" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Image Text Snippet - Default Image</field>
-            <field name="datas_fname">s_image_text_default_image.jpg</field>
+            <field name="name">s_image_text_default_image.jpg</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_image_text.jpg</field>
         </record>
         <record id="website.s_text_image_default_image" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Text Image Snippet - Default Image</field>
-            <field name="datas_fname">s_text_image_default_image.jpg</field>
+            <field name="name">s_text_image_default_image.jpg</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_text_image.jpg</field>
         </record>
         <record id="website.s_carousel_default_image_1" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Carousel Snippet - Default Image 1</field>
-            <field name="datas_fname">s_carousel_default_image_1.jpg</field>
+            <field name="name">s_carousel_default_image_1.jpg</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_carousel_1.jpg</field>
         </record>
         <record id="website.s_carousel_default_image_2" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Carousel Snippet - Default Image 2</field>
-            <field name="datas_fname">s_carousel_default_image_2.jpg</field>
+            <field name="name">s_carousel_default_image_2.jpg</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_carousel_2.jpg</field>
         </record>
         <record id="website.s_carousel_default_image_3" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Carousel Snippet - Default Image 3</field>
-            <field name="datas_fname">s_carousel_default_image_3.jpg</field>
+            <field name="name">s_carousel_default_image_3.jpg</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_carousel_3.jpg</field>
         </record>
         <record id="website.s_picture_default_image" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Picture Snippet - Default Image</field>
-            <field name="datas_fname">s_picture_default_image.jpg</field>
+            <field name="name">s_picture_default_image.jpg</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_picture.jpg</field>
         </record>
         <record id="website.s_banner_default_image" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Banner Snippet - Default Image</field>
-            <field name="datas_fname">s_banner_default_image.jpg</field>
+            <field name="name">s_banner_default_image.jpg</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_banner.jpg</field>
         </record>
         <record id="website.s_parallax_default_image" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Parallax Snippet - Default Image</field>
-            <field name="datas_fname">s_parallax_default_image.jpg</field>
+            <field name="name">s_parallax_default_image.jpg</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_parallax.jpg</field>
         </record>
         <record id="website.s_reference_demo_image_1" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Reference Snippet - Demo Image 1</field>
-            <field name="datas_fname">s_reference_demo_image_1.png</field>
+            <field name="name">s_reference_demo_image_1.png</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_references_1.png</field>
         </record>
         <record id="website.s_reference_demo_image_2" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Reference Snippet - Demo Image 2</field>
-            <field name="datas_fname">s_reference_demo_image_2.png</field>
+            <field name="name">s_reference_demo_image_2.png</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_references_2.png</field>
         </record>
         <record id="website.s_reference_demo_image_3" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Reference Snippet - Demo Image 3</field>
-            <field name="datas_fname">s_reference_demo_image_3.png</field>
+            <field name="name">s_reference_demo_image_3.png</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_references_3.png</field>
         </record>
         <record id="website.s_reference_demo_image_4" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Reference Snippet - Demo Image 4</field>
-            <field name="datas_fname">s_reference_demo_image_4.png</field>
+            <field name="name">s_reference_demo_image_4.png</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_references_4.png</field>
         </record>
         <record id="website.s_reference_demo_image_5" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Reference Snippet - Demo Image 5</field>
-            <field name="datas_fname">s_reference_demo_image_5.png</field>
+            <field name="name">s_reference_demo_image_5.png</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_references_5.png</field>
         </record>
         <record id="website.s_company_team_image_1" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Company Team Snippet - Image 1</field>
-            <field name="datas_fname">s_company_team_image_1.png</field>
+            <field name="name">s_company_team_image_1.png</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_team_member_1.png</field>
         </record>
         <record id="website.s_company_team_image_2" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Company Team Snippet - Image 2</field>
-            <field name="datas_fname">s_company_team_image_2.png</field>
+            <field name="name">s_company_team_image_2.png</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_team_member_2.png</field>
         </record>
         <record id="website.s_company_team_image_3" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Company Team Snippet - Image 3</field>
-            <field name="datas_fname">s_company_team_image_3.png</field>
+            <field name="name">s_company_team_image_3.png</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_team_member_3.png</field>
         </record>
         <record id="website.s_company_team_image_4" model="ir.attachment">
             <field name="public" eval="True"/>
-            <field name="name">Company Team Snippet - Image 4</field>
-            <field name="datas_fname">s_company_team_image_4.png</field>
+            <field name="name">s_company_team_image_4.png</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/snippets_demo/s_team_member_4.png</field>
         </record>
-- 
cgit v1.2.3