diff --git a/README.md b/README.md index 69229b72eaf302b1ef86bb6574e2bafb50e413e7..eaba737e41e5c14a98afae65698cdbe8ea4fe829 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,10 @@ ## Description -Event improvement for webinar +- Event improvement for webinar + - Add link to webinar on event form view + - Overrides mail template to provide webinar link +- Reorganize registration fields in Registration group on event form view ## Exemple @@ -17,7 +20,8 @@ been financially supported by: ## Contributors -* Thibaud <Thibaud@le-filament.com> +* Thibaud <thibaud@le-filament.com> +* Rémi <remi@le-filament.com> ## Maintainer diff --git a/__manifest__.py b/__manifest__.py index 94137f1c9e1891197fd4c57952be63ea87bb0ccd..1828fe13950e48ef10f097b5dca5dfd6e956bd38 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -5,9 +5,8 @@ "website": "https://le-filament.com", "version": "16.0.1.0.0", "license": "AGPL-3", - "depends": ["event"], + "depends": ["partner_event", "website_event_private", "website_event_require_login"], "data": [ - "security/ir.model.access.csv", # datas "data/mail_template_data.xml", # views @@ -15,13 +14,6 @@ # views menu # wizard ], - "assets": { - "web._assets_primary_variables": [], - "web._assets_frontend_helpers": [], - "web.assets_frontend": [], - "web.assets_tests": [], - "web.assets_qweb": [], - }, "installable": True, "auto_install": False, } diff --git a/data/mail_template_data.xml b/data/mail_template_data.xml index 92f862feddf7cc8fcc0f8b4ef02ba21b97e66f9a..af1f972ed9bec8ba2a37dd0c510d6be2fe222c24 100644 --- a/data/mail_template_data.xml +++ b/data/mail_template_data.xml @@ -201,15 +201,15 @@ </a> <br /> <t - t-if="object.lien_webinaire" + t-if="object.webinar_link" > You can access the webinar via this link: <t - t-out="object.lien_webinaire" + t-out="object.webinar_link" > - Awsome link + Awesome link </t> </t> <br /> diff --git a/i18n/fr.po b/i18n/fr.po index 233fa7223c488b9054e2826f017fcbf35b9cb023..5f5ae40099aa138191877ec9755c952c94e92f3a 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -221,13 +221,13 @@ msgid "" " Yahoo\n" " </a>\n" " <br>\n" -" <t t-if=\"object.lien_webinaire\">\n" +" <t t-if=\"object.webinar_link\">\n" " You can access the\n" " webinar\n" " via this link:\n" " <t t-out=\"object." -"lien_webinaire\">\n" -" Awsome link\n" +"webinar_link\">\n" +" Awesome link\n" " </t>\n" " </t>\n" " <br>\n" @@ -873,13 +873,13 @@ msgstr "" " Yahoo\n" " </a>\n" " <br>\n" -" <t t-if=\"object.lien_webinaire\">\n" +" <t t-if=\"object.webinar_link\">\n" " Vous pouvez accèder\n" " au wébinaire\n" " au travers de ce lien:\n" " <t t-out=\"object." -"lien_webinaire\">\n" -" Awsome link\n" +"webinar_link\">\n" +" Awesome link\n" " </t>\n" " </t>\n" " <br>\n" @@ -2238,11 +2238,6 @@ msgstr "" " 'Event').replace('/','') }}\n" " " -#. module: solagro_event -#: model:ir.model.fields,field_description:solagro_event.field_event_event__lien_webinaire -msgid "Lien Webinaire" -msgstr "Lien Webinaire" - #. module: solagro_event #: model:mail.template,description:solagro_event.solagro_event_reminder msgid "" @@ -2260,6 +2255,11 @@ msgid "" " " msgstr "Envoyé aux participants après leur inscription à l'événement" +#. module: solagro_event +#: model:ir.model.fields,field_description:solagro_event.field_event_event__webinar_link +msgid "Webinar Link" +msgstr "Lien Webinaire" + #. module: solagro_event #: model:mail.template,subject:solagro_event.solagro_event_subscription msgid "" diff --git a/i18n/solagro_event.pot b/i18n/solagro_event.pot index f5bdd523df1b88c52122e201c34d75dc515f3816..1d26c2c41d10057d2e8c2708db6bd00a77f2e9bf 100644 --- a/i18n/solagro_event.pot +++ b/i18n/solagro_event.pot @@ -108,12 +108,12 @@ msgid "" " Yahoo\n" " </a>\n" " <br>\n" -" <t t-if=\"object.lien_webinaire\">\n" +" <t t-if=\"object.webinar_link\">\n" " You can access the\n" " webinar\n" " via this link:\n" -" <t t-out=\"object.lien_webinaire\">\n" -" Awsome link\n" +" <t t-out=\"object.webinar_link\">\n" +" Awesome link\n" " </t>\n" " </t>\n" " <br>\n" @@ -742,11 +742,6 @@ msgid "" " " msgstr "" -#. module: solagro_event -#: model:ir.model.fields,field_description:solagro_event.field_event_event__lien_webinaire -msgid "Lien Webinaire" -msgstr "" - #. module: solagro_event #: model:mail.template,description:solagro_event.solagro_event_reminder msgid "" @@ -762,6 +757,11 @@ msgid "" " " msgstr "" +#. module: solagro_event +#: model:ir.model.fields,field_description:solagro_event.field_event_event__webinar_link +msgid "Webinar Link" +msgstr "" + #. module: solagro_event #: model:mail.template,subject:solagro_event.solagro_event_subscription msgid "" diff --git a/models/event_event.py b/models/event_event.py index a211b2c8768317b9009dd117c8040bedceb690ee..c25aac3acce7e535423bc39ad8ddcb05610efaeb 100644 --- a/models/event_event.py +++ b/models/event_event.py @@ -53,7 +53,7 @@ class EventType(models.Model): class Event(models.Model): _inherit = "event.event" - lien_webinaire = fields.Char() + webinar_link = fields.Char() # ------------------------------------------------------ # Default methods diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv deleted file mode 100644 index 301b7dab167cbcb978ea78e7da9e7f032c40b90e..0000000000000000000000000000000000000000 --- a/security/ir.model.access.csv +++ /dev/null @@ -1 +0,0 @@ -id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink diff --git a/views/event.xml b/views/event.xml index 755f52941cfc69226a8113ba57ce651e6e6c3bc3..1505a2c0e8f0e63a4a0b2883ffba9dee01ae9278 100644 --- a/views/event.xml +++ b/views/event.xml @@ -1,16 +1,65 @@ <?xml version="1.0" encoding="utf-8" ?> +<!-- + Copyright (c) 2024- Le Filament (https://le-filament.com) + License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + --> <odoo> <!-- Form --> - <record id="event_type_form" model="ir.ui.view"> + <record id="event_form" model="ir.ui.view"> <field name="name">solagro.event.event.form</field> <field name="model">event.event</field> <field name="inherit_id" ref="event.view_event_form" /> - <field name="priority">90</field> + <field name="priority">101</field> <field name="arch" type="xml"> - <xpath expr="//field[@name='tag_ids']" position="after"> - <field name="lien_webinaire" /> + <xpath expr="//notebook" position="before"> + <group name="registration" string="Inscriptions"> + <group> + <field name="webinar_link" /> + </group> + <group /> + </group> + </xpath> + </field> + </record> + <record id="website_event_private.event_event_view_form" model="ir.ui.view"> + <field name="inherit_id" ref="solagro_event.event_form" /> + <field name="priority">10</field> + <field name="arch" type="xml"> + <xpath expr="//group[@name='registration']//group[2]" position="inside"> + <field name="event_privacy"/> + <field name="event_share_link" widget="CopyClipboardChar" options="{'string': 'Copy link'}" attrs="{'invisible': [('event_privacy', '=', 'public')]}"/> + </xpath> + </field> + </record> + <record id="partner_event.view_event_form_partner" model="ir.ui.view"> + <field name="inherit_id" ref="solagro_event.event_form" /> + <field name="priority">20</field> + <field name="arch" type="xml"> + <xpath expr="//group[@name='registration']//group[2]" position="inside"> + <field name="create_partner" /> + </xpath> + </field> + </record> + <record id="website_event_require_login.view_event_form" model="ir.ui.view"> + <field name="inherit_id" ref="solagro_event.event_form" /> + <field name="priority">30</field> + <field name="arch" type="xml"> + <xpath expr="//group[@name='registration']//group[2]" position="inside"> + <field name="website_require_login" /> + </xpath> + </field> + </record> + <record id="event_move_fields_form" model="ir.ui.view"> + <field name="name">solagro.event.move.fields.form</field> + <field name="model">event.event</field> + <field name="inherit_id" ref="solagro_event.event_form" /> + <field name="priority">50</field> + <field name="arch" type="xml"> + <xpath expr="//field[@name='webinar_link']" position="before"> + <xpath expr="//label[@for='seats_limited']" position="move" /> + <xpath expr="//div[field[@name='seats_limited']]" position="move" /> + <xpath expr="//field[@name='auto_confirm']" position="move" /> </xpath> </field> </record> - </odoo>