Browse Source

google calendar fix

dev-rcn
root 3 years ago
parent
commit
dcb4cbff42
2 changed files with 12 additions and 5 deletions
  1. +10
    -3
      models/event.py
  2. +2
    -2
      views/event.xml

+ 10
- 3
models/event.py View File

@ -5,7 +5,7 @@ from psycopg2 import sql, DatabaseError
from pytz import timezone from pytz import timezone
from werkzeug import utils from werkzeug import utils
from odoo.tools import remove_accents
import os.path import os.path
from google.oauth2 import service_account from google.oauth2 import service_account
@ -246,7 +246,14 @@ class KalachakraEvent(models.Model):
name_param=self.name.replace(' ','-') name_param=self.name.replace(' ','-')
name_param=name_param.replace('\'','-') name_param=name_param.replace('\'','-')
description='<a href="'+self.env['ir.config_parameter'].get_param('web.base.url')+'/event/'+name_param+'-'+date_param+'/register">Click here to register</a>'
nbcars=300
ldesc=len(self.description)
if ldesc<nbcars:
fin=ldesc
else:
fin=nbcars
description=self.description[30:fin]
description=description+'...<br><a href="'+self.env['ir.config_parameter'].get_param('web.base.url')+'/event/'+remove_accents(name_param)+'-'+date_param+'/register">En savoir plus</a>'
#str(self.date_begin.year())+'-'+str(self.date_begin.month())+'-'+self.date_begin.day() #str(self.date_begin.year())+'-'+str(self.date_begin.month())+'-'+self.date_begin.day()
body={"summary": self.name, body={"summary": self.name,
@ -269,7 +276,7 @@ class KalachakraEvent(models.Model):
def remove_event_from_google_agenda(self): def remove_event_from_google_agenda(self):
credentials = service_account.Credentials.from_service_account_file(SERVICE_ACCOUNT_FILE, scopes=SCOPES)
credentials = service_account.Credentials.from_service_account_file(GOOGLE_ACCOUNT_FILE, scopes=SCOPES)
delegated_credentials = credentials.with_subject(SUBJECT) delegated_credentials = credentials.with_subject(SUBJECT)
service = build('calendar', 'v3', credentials=delegated_credentials) service = build('calendar', 'v3', credentials=delegated_credentials)


+ 2
- 2
views/event.xml View File

@ -30,7 +30,7 @@
<field name="calendar_event_id" invisible="1"/> <field name="calendar_event_id" invisible="1"/>
<field name="parent_event_id" invisible="1"/> <field name="parent_event_id" invisible="1"/>
<field name="frequency" invisible="1"/> <field name="frequency" invisible="1"/>
<field name="end_generation_date" invisible="1"/>
<field name="end_generation_date" widget="date" invisible="1"/>
<field name="generated_events" invisible="1"/> <field name="generated_events" invisible="1"/>
</xpath> </xpath>
@ -43,7 +43,7 @@
<field name="frequency" attrs="{'invisible':['|',('booking_event','=',True),('recurring_event','=',False)]}"/> <field name="frequency" attrs="{'invisible':['|',('booking_event','=',True),('recurring_event','=',False)]}"/>
<field name="weekly_day" attrs="{'invisible':[('frequency','!=','weekly')]}"/> <field name="weekly_day" attrs="{'invisible':[('frequency','!=','weekly')]}"/>
<field name="end_generation_date" attrs="{'invisible':['|',('booking_event','=',True),('recurring_event','=',False)]}"/>
<field name="end_generation_date" widget="date" attrs="{'invisible':['|',('booking_event','=',True),('recurring_event','=',False)]}"/>
<field name="parent_event_id" attrs="{'invisible':['|',('booking_event','=',True),('recurring_event','=',False)]}"/> <field name="parent_event_id" attrs="{'invisible':['|',('booking_event','=',True),('recurring_event','=',False)]}"/>
<field name="recurring_event_newsletter_id" attrs="{'invisible':['|',('booking_event','=',True),('recurring_event','=',False)]}"/> <field name="recurring_event_newsletter_id" attrs="{'invisible':['|',('booking_event','=',True),('recurring_event','=',False)]}"/>


Loading…
Cancel
Save