Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
B
bluemind4-connector
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse du dépôt
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté GitLab
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Le Filament
bluemind4-connector
Validations
02a17cc9
Valider
02a17cc9
rédigé
10 mai 2022
par
Rémi - Le Filament
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
[FIX] rights and domains
parent
61bed106
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Modifications
1
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
1 fichier modifié
models/res_users.py
+6
-5
6 ajouts, 5 suppressions
models/res_users.py
avec
6 ajouts
et
5 suppressions
models/res_users.py
+
6
−
5
Voir le fichier @
02a17cc9
...
@@ -169,8 +169,9 @@ class ResUser(models.Model):
...
@@ -169,8 +169,9 @@ class ResUser(models.Model):
# Only if Organizer is the same as Odoo user or if is not linked to
# Only if Organizer is the same as Odoo user or if is not linked to
# any active Odoo internal user
# any active Odoo internal user
if
(
if
(
bm_event
.
value
.
main
.
organizer
.
mailto
==
self
.
partner_id
.
email
bm_event
.
value
.
main
.
organizer
or
bm_event
.
value
.
main
.
organizer
.
mailto
not
in
odoo_users_emails
and
(
bm_event
.
value
.
main
.
organizer
.
mailto
==
self
.
partner_id
.
email
or
bm_event
.
value
.
main
.
organizer
.
mailto
not
in
odoo_users_emails
)
):
):
events_to_create
.
append
(
Calendar
.
_bm_to_odoo_values
(
bm_event
))
events_to_create
.
append
(
Calendar
.
_bm_to_odoo_values
(
bm_event
))
if
events_to_create
:
if
events_to_create
:
...
@@ -182,7 +183,7 @@ class ResUser(models.Model):
...
@@ -182,7 +183,7 @@ class ResUser(models.Model):
bm_events_to_update
=
bm_calendar
.
multipleGet
(
bm_updated_uids
)
bm_events_to_update
=
bm_calendar
.
multipleGet
(
bm_updated_uids
)
# Update corresponding events
# Update corresponding events
for
bm_event
in
bm_events_to_update
:
for
bm_event
in
bm_events_to_update
:
odoo_event
=
odoo_events_bm_linked
.
filtered
(
odoo_event
=
odoo_events_bm_linked
.
filtered
_domain
(
[(
"
bluemind_id
"
,
"
=
"
,
bm_event
.
uid
)]
[(
"
bluemind_id
"
,
"
=
"
,
bm_event
.
uid
)]
)
)
# If related event exists in Odoo and belongs to the user, update it
# If related event exists in Odoo and belongs to the user, update it
...
@@ -198,7 +199,7 @@ class ResUser(models.Model):
...
@@ -198,7 +199,7 @@ class ResUser(models.Model):
# Calendar entries that have been deleted on Bluemind to be deleted on Odoo
# Calendar entries that have been deleted on Bluemind to be deleted on Odoo
# (only if belongs to user)
# (only if belongs to user)
if
bm_deleted_uids
:
if
bm_deleted_uids
:
odoo_events_to_delete
=
odoo_events_bm_linked
.
filtered
(
odoo_events_to_delete
=
odoo_events_bm_linked
.
filtered
_domain
(
[(
"
bluemind_id
"
,
"
in
"
,
bm_deleted_uids
),
(
"
user_id
"
,
"
=
"
,
self
.
id
)]
[(
"
bluemind_id
"
,
"
in
"
,
bm_deleted_uids
),
(
"
user_id
"
,
"
=
"
,
self
.
id
)]
)
)
if
odoo_events_to_delete
:
if
odoo_events_to_delete
:
...
@@ -228,7 +229,7 @@ class ResUser(models.Model):
...
@@ -228,7 +229,7 @@ class ResUser(models.Model):
for
user
in
users
:
for
user
in
users
:
_logger
.
info
(
"
Calendar Synchro - Starting synchronization for %s
"
,
user
)
_logger
.
info
(
"
Calendar Synchro - Starting synchronization for %s
"
,
user
)
try
:
try
:
user
.
with_user
(
user
).
sudo
().
sync_bluemind_calendar
()
user
.
with_user
(
user
).
sync_bluemind_calendar
()
_logger
.
info
(
_logger
.
info
(
"
Calendar Synchro - Completed synchronization for %s
"
,
user
"
Calendar Synchro - Completed synchronization for %s
"
,
user
)
)
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter