From ce8a4968deb120d4ba93cc590efcb8b1fbbd6db7 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Wed, 11 Dec 2013 14:06:35 +0100
Subject: [PATCH] [REF] Ref to remove warning about missing user_id in
 calendar.attendee

bzr revid: jke@openerp.com-20131211130635-hjrb306zrph4dcg5
---
 addons/base_calendar/base_calendar.py         |  14 ++---
 addons/base_calendar/crm_meeting_view.xml     |   6 +-
 .../static/src/css/base_calender.css          |   2 +-
 .../static/src/xml/base_calendar.xml          |   2 +-
 .../google_base_account/controllers/main.py   |  55 ++++++++----------
 .../google_base_account.py                    |  19 +++---
 addons/google_calendar/__init__.pyc           | Bin 179 -> 179 bytes
 addons/google_calendar/google_calendar.py     |  28 ++-------
 addons/google_calendar/google_calendar.pyc    | Bin 30952 -> 30836 bytes
 .../static/src/js/calendar_sync.js            |   4 +-
 10 files changed, 53 insertions(+), 77 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index f118c810aac..b9173dc7d28 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -115,7 +115,7 @@ class calendar_attendee(osv.osv):
         return result
 
     _columns = {
-        'state': fields.selection([('needs-action', 'Needs Action'),('tentative', 'Uncertain'),('declined', 'Declined'),('accepted', 'Accepted')], 'Status', readonly=True, help="Status of the attendee's participation"),
+        'state': fields.selection([('needsAction', 'Needs Action'),('tentative', 'Uncertain'),('declined', 'Declined'),('accepted', 'Accepted')], 'Status', readonly=True, help="Status of the attendee's participation"),
         'cn': fields.function(_compute_data, string='Common name', type="char", size=124, multi='cn', store=True),
         'dir': fields.char('URI Reference', size=124, help="Reference to the URI that points to the directory information corresponding to the attendee."),
         'partner_id': fields.many2one('res.partner', 'Contact',readonly="True"),
@@ -127,7 +127,7 @@ class calendar_attendee(osv.osv):
         'event_id': fields.many2one('crm.meeting','Meeting linked'),        
     }
     _defaults = {
-        'state': 'needs-action',        
+        'state': 'needsAction',        
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -220,7 +220,7 @@ class calendar_attendee(osv.osv):
         template_pool = self.pool.get('email.template')
         local_context = context.copy()
         color = {
-                 'needs-action' : 'grey',
+                 'needsAction' : 'grey',
                  'accepted' :'green',
                  'tentative' :'#FFFF00',
                  'declined':'red'                 
@@ -297,8 +297,7 @@ class calendar_attendee(osv.osv):
         meeting_obj =  self.pool.get('crm.meeting')
         res = self.write(cr, uid, ids, {'state': 'accepted'}, context)
         for attendee in self.browse(cr, uid, ids, context=context):
-            if attendee.ref:
-                meeting_obj.message_post(cr, uid, attendee.event_id.id, body=_(("%s has accepted invitation") % (attendee.cn)),subtype="base_calendar.subtype_invitation", context=context)
+            meeting_obj.message_post(cr, uid, attendee.event_id.id, body=_(("%s has accepted invitation") % (attendee.cn)),subtype="base_calendar.subtype_invitation", context=context)
                 
         return res
     
@@ -572,7 +571,7 @@ class calendar_alarm_manager(osv.osv):
             template_pool = self.pool.get('email.template')
             local_context = context and context.copy() or {}
             color = {
-                     'needs-action' : 'grey',
+                     'needsAction' : 'grey',
                      'accepted' :'green',
                      'tentative' :'#FFFF00',
                      'declined':'red'                 
@@ -849,7 +848,7 @@ class crm_meeting(osv.Model):
                 if field == 'is_attendee':
                     res[meeting_id][field] = True if attendee else False
                 elif field == 'attendee_status':
-                    res[meeting_id][field] = attendee.state if attendee else 'needs-action'
+                    res[meeting_id][field] = attendee.state if attendee else 'needsAction'
                 elif field == 'display_time':
                     res[meeting_id][field] = self._get_display_time(cr, uid, meeting_id, context=context)
         return res
@@ -1082,7 +1081,6 @@ class crm_meeting(osv.Model):
                 access_token = self.new_invitation_token(cr, uid, event, partner.id)
                 att_id = self.pool.get('calendar.attendee').create(cr, uid, {
                     'partner_id': partner.id,
-                    'user_id': partner.user_ids and partner.user_ids[0].id or False,
                     'event_id': event.id,
                     'access_token': access_token,
                     'email': partner.email,
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index b5408b4198d..79cbc6968e6 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -138,9 +138,9 @@
                                     <field name="state" />
                                     <field name="email" widget="email"/>                                   
                                      
-                                    <button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" icon="terp-crm" />
-                                    <button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" icon="gtk-apply"/>
-                                    <button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" icon="gtk-cancel"/>
+                                    <button name="do_tentative" states="needsAction,declined,accepted" string="Uncertain" type="object" icon="terp-crm" />
+                                    <button name="do_accept" string="Accept" states="needsAction,tentative,declined" type="object" icon="gtk-apply"/>
+                                    <button name="do_decline" string="Decline" states="needsAction,tentative,accepted" type="object" icon="gtk-cancel"/>
                                 </tree>
                             </field>
                         </page>
diff --git a/addons/base_calendar/static/src/css/base_calender.css b/addons/base_calendar/static/src/css/base_calender.css
index f8858d8b88a..a930244d630 100644
--- a/addons/base_calendar/static/src/css/base_calender.css
+++ b/addons/base_calendar/static/src/css/base_calender.css
@@ -4,7 +4,7 @@
     margin-bottom : -4px;
     display : inline-block;
 }
-.openerp .needs-action , .tentative,.text-core .text-tag .custom-edit, .text-core .text-tag .tentative {
+.openerp .needsAction , .tentative,.text-core .text-tag .custom-edit, .text-core .text-tag .tentative {
     background : url(/web/static/src/img/icons/gtk-normal.png) no-repeat;
     background-size : 11px 11px;
 }
diff --git a/addons/base_calendar/static/src/xml/base_calendar.xml b/addons/base_calendar/static/src/xml/base_calendar.xml
index d5f07aed07c..42689c5515a 100644
--- a/addons/base_calendar/static/src/xml/base_calendar.xml
+++ b/addons/base_calendar/static/src/xml/base_calendar.xml
@@ -15,7 +15,7 @@
         <div class="oe_right"><b><t t-esc="invitation['current_attendee'].cn"/> (<t t-esc="invitation['current_attendee'].email"/>)</b></div>
         <div class="oe_left"><img class="cal_inline cal_image" t-attf-src="data:image/png;base64,#{invitation['logo']}"/><p class="cal_tag cal_inline">Calendar</p></div>
         <div class="invitation_block">
-            <t t-if="invitation['current_attendee'].state != 'needs-action'">
+            <t t-if="invitation['current_attendee'].state != 'needsAction'">
                 <div class="event_status"><a t-attf-class="attendee_#{invitation['current_attendee'].state}"><b t-if="invitation['current_attendee'].state == 'accepted'">Yes I'm going.</b><b t-if="invitation['current_attendee'].state == 'declined'">No I'm not going.</b></a></div>
             </t>
             <div class="cal_meeting"><t t-esc="invitation['meeting'].event"/></div>
diff --git a/addons/google_base_account/controllers/main.py b/addons/google_base_account/controllers/main.py
index dd5464d7a42..30e72a86b82 100644
--- a/addons/google_base_account/controllers/main.py
+++ b/addons/google_base_account/controllers/main.py
@@ -4,7 +4,6 @@ import openerp
 import openerp.addons.web.http as http
 from openerp.addons.web.http import request
 import openerp.addons.web.controllers.main as webmain
-import json
 from openerp.addons.web.http import SessionExpiredException
 from werkzeug.exceptions import BadRequest
 import werkzeug.utils
@@ -13,29 +12,41 @@ class google_auth(http.Controller):
     
     @http.route('/googleauth/oauth2callback', type='http', auth="none")
     def oauth2callback(self, **kw):
+        """ This route/function is called by Google when user Accept/Refuse the consent of Google """
         
         state = simplejson.loads(kw['state'])
-
         dbname = state.get('d')
+        service = state.get('s')
         url_return = state.get('from')
         
         registry = openerp.modules.registry.RegistryManager.get(dbname)
         with registry.cursor() as cr:
-            #TODO CHECK IF REQUEST OK
-            registry.get('google.calendar').set_all_tokens(cr,request.session.uid,kw['code'])
-            #registry.get('google.calendar').set_primary_id(cr,request.session.uid)
+            if kw.get('code'):
+                registry.get('google.%s' % service).set_all_tokens(cr,request.session.uid,kw['code'])
+                return werkzeug.utils.redirect(url_return)
             
-        return werkzeug.utils.redirect(url_return)        
-
+            #TODO - Display error at customer if url contains ?Error=
+            elif kw.get('error'):
+                return werkzeug.utils.redirect("%s%s%s" % (url_return ,"?Error=" , kw.get('error')))
+            else:
+                return werkzeug.utils.redirect("%s%s%s" % (url_return ,"?Error=Unknown_error"))
+            
+                
     @http.route('/web_calendar_sync/sync_calendar/sync_data', type='json', auth='user')
     def sync_data(self, arch, fields, model,**kw):
-       
+        """ 
+            This route/function is called when we want to synchronize openERP calendar with Google Calendar
+            
+            Function return a dictionary with the status :  NeedConfigFromAdmin, NeedAuth, NeedRefresh, NoNewEventFromGoogle, SUCCESS if not crm meeting
+            The dictionary may contains an url, to allow OpenERP Client to redirect user on this URL for authorization for example 
                     
+        """
+                            
         if model == 'crm.meeting':
             gs_obj = request.registry.get('google.service')
             gc_obj = request.registry.get('google.calendar')
             
-            #We check that admin has already configure api for google synchronization !
+            # Checking that admin have already configured Google API for google synchronization !
             client_id = gs_obj.get_client_id(request.cr, request.uid,'calendar',context=kw.get('LocalContext'))
 
             if not client_id or client_id == '':
@@ -44,7 +55,7 @@ class google_auth(http.Controller):
                         "url" : '' 
                         }
                         
-            #We check that user has already accepted openerp to access his calendar !
+            # Checking that user have already  accepted OpenERP to access his calendar !
             if gc_obj.need_authorize(request.cr, request.uid,context=kw.get('LocalContext')):
                 url =  gc_obj.authorize_google_uri(request.cr, request.uid, from_url=kw.get('fromurl'),context=kw.get('LocalContext'))
                 return {
@@ -52,27 +63,9 @@ class google_auth(http.Controller):
                         "url" : url 
                         }
             
-            #We launch the synchronization
-            result = gc_obj.synchronize_events(request.cr, request.uid, [], kw.get('LocalContext'))
-            return result
-        else:            
-            calendar_info = {
-               'field_data':{},
-               'date_start':arch['attrs'].get('date_start'),
-               'date_stop':arch['attrs'].get('date_stop'),
-               'calendar_string':arch['attrs'].get('string'),
-               'model':model
-            }
-            for field, data in fields.items():
-                calendar_info['field_data'][field] = {
-                     'type': data.get('type'),
-                     'string': data.get('string')
-                }            
-            
-            print "@@@@@@@@@@@@@@@@@  Is still used !!!!"
-            gc_obj.synchronize_calendar(request.cr, request.uid, calendar_info, kw.get('LocalContext'))
-        
-        
+            # If App authorized, and user access accepted, We launch the synchronization
+            return gc_obj.synchronize_events(request.cr, request.uid, [], kw.get('LocalContext'))
+                      
         return { "status" : "SUCCESS" }
 
 
diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py
index a895c271314..8351ddd7928 100644
--- a/addons/google_base_account/google_base_account.py
+++ b/addons/google_base_account/google_base_account.py
@@ -65,8 +65,9 @@ class google_service(osv.osv_memory):
     
     #If no scope is passed, we use service by default to get a default scope
        
+       
     def _get_authorize_uri(self, cr, uid, from_url, service, scope = False, context=None): 
-        
+        """ This method return the url needed to allow this instance of OpenErp to access to the scope of gmail specified as parameters """
         state_obj = {}
         state_obj['d'] = cr.dbname
         state_obj['s'] = service
@@ -88,7 +89,7 @@ class google_service(osv.osv_memory):
         uri = self.get_uri_oauth(a='auth') + "?%s" % urllib.urlencode(params)
         return uri
             
-    def _get_google_token_json(self, cr, uid, authorize_code, service, context=None): #exchange_AUTHORIZATION vs Token (service = calendar)
+    def _get_google_token_json(self, cr, uid, authorize_code, service, context=None): 
         res = False
         base_url = self.get_base_url(cr, uid, context)
         client_id = self.get_client_id(cr, uid, service, context)
@@ -107,13 +108,13 @@ class google_service(osv.osv_memory):
         try:
             data = urllib.urlencode(params)
             req = urllib2.Request(self.get_uri_oauth(a='token'), data, headers)
+            
             content = urllib2.urlopen(req).read()
             res = simplejson.loads(content)            
             
         except urllib2.HTTPError,e:
             print e
-            raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"), context=context)
-            
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during your token generation. Maybe your Authorization Code is invalid"), context=context)            
         return res
                 
     def _refresh_google_token_json(self, cr, uid, refresh_token, service, context=None): #exchange_AUTHORIZATION vs Token (service = calendar)
@@ -163,11 +164,13 @@ class google_service(osv.osv_memory):
             else:
                 raise ('Method not supported [%s] not in [GET, POST, PUT or PATCH]!' % (type))
             req.get_method = lambda: type.upper()            
-            req.add_header('Pragma', 'no-cache')
+
             request = urllib2.urlopen(req)
             
-            if request.getcode() == 204:
+            if request.getcode() == 204: #No content returned, (ex: POST calendar/event/clear)
                 res = True
+            elif request.getcode() == 404: #Page not found
+                res = False
             else:
                 content=request.read()
                 res = simplejson.loads(content)
@@ -177,7 +180,7 @@ class google_service(osv.osv_memory):
                 print "=========="
         except urllib2.HTTPError,e:
             print "ERROR CATCHED : ",e.read()
-            raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"), context=context)
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong with your request to google"), context=context)
           
         return res
         
@@ -190,7 +193,7 @@ class google_service(osv.osv_memory):
     def get_client_secret(self, cr, uid, service, context=None):
         return self.pool.get('ir.config_parameter').get_param(cr, uid, 'google_%s_client_secret' % (service,),context=context).strip()
     
-    def get_uri_oauth(self,a=''): #a = optionnal action
+    def get_uri_oauth(self,a=''): #a = optional action
         return "https://accounts.google.com/o/oauth2/%s" % (a,)
     
     def get_uri_api(self):
diff --git a/addons/google_calendar/__init__.pyc b/addons/google_calendar/__init__.pyc
index f937a51b89dbb63efe648bcd740a3d3eca3904bd..12127a01566453fbfe5f8023f1545023e1731733 100644
GIT binary patch
delta 15
WcmdnYxS5fi`7<w9itdVu>}voerv&-{

delta 15
XcmdnYxS5fi`7<xqlr3{7vabOEDLw_J

diff --git a/addons/google_calendar/google_calendar.py b/addons/google_calendar/google_calendar.py
index 84477dbfdb8..f1e755a7491 100644
--- a/addons/google_calendar/google_calendar.py
+++ b/addons/google_calendar/google_calendar.py
@@ -38,19 +38,6 @@ from openerp.osv import fields, osv
 from openerp.osv import osv
 
 
-google_state_mapping = {
-    'needs-action':'needsAction',
-    'declined': 'declined',
-    'tentative':'tentative',
-    'accepted':'accepted',
-    'delegated':'declined',
-}
-oe_state_mapping = {
-    'needsAction':'needs-action',
-    'declined': 'declined',
-    'tentative':'tentative',
-    'accepted':'accepted',
-}
 
 class google_calendar(osv.osv):
     _name = 'google.calendar'
@@ -71,14 +58,12 @@ class google_calendar(osv.osv):
             end_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date_deadline, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T')
             type = 'dateTime'
         attendee_list = []
-        
-        print "att for event %s : %s" % (event.id,event.attendee_ids)
 
         for attendee in event.attendee_ids:
             attendee_list.append({
                 'email':attendee.email or 'NoEmail@mail.com',
                 'displayName':attendee.partner_id.name,
-                'responseStatus':google_state_mapping.get(attendee.state, 'needsAction'),
+                'responseStatus':attendee.state or 'needsAction',
             })
         data = {
             "summary": event.name or '',
@@ -112,10 +97,8 @@ class google_calendar(osv.osv):
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
         data_json = simplejson.dumps(data)
         
-        response = gs_pool._do_request(cr, uid, url, data_json, headers, type='POST', context=context)
-        #TODO Check response result
-        
-        return response
+        return gs_pool._do_request(cr, uid, url, data_json, headers, type='POST', context=context)
+    
         
     def delete_an_event(self, cr, uid,event_id, context=None):
         gs_pool = self.pool.get('google.service')
@@ -128,7 +111,6 @@ class google_calendar(osv.osv):
         url = "/calendar/v3/calendars/%s/events/%s" % ('primary',event_id)
         
         response = gs_pool._do_request(cr, uid, url, params, headers, type='DELETE', context=context)
-        print "@@@RESPONSE",response
         return response
         
     def get_event_dict(self,cr,uid,token=False,nextPageToken=False,context=None):
@@ -243,7 +225,7 @@ class google_calendar(osv.osv):
                 if type == "write":
                     for oe_attendee in event['attendee_ids']:
                         if oe_attendee.email == google_attendee['email']:
-                            calendar_attendee_obj.write(cr, uid,[oe_attendee.id] ,{'state' : oe_state_mapping[google_attendee['responseStatus']]},context=context)
+                            calendar_attendee_obj.write(cr, uid,[oe_attendee.id] ,{'state' : google_attendee['responseStatus']},context=context)
                             google_attendee['found'] = True
                             continue
                             
@@ -255,7 +237,7 @@ class google_calendar(osv.osv):
                 attendee = res_partner_obj.read(cr, uid, attendee_id[0], ['email'], context=context)
                 partner_record.append((4, attendee.get('id')))
                 attendee['partner_id'] = attendee.pop('id')                
-                attendee['state'] = oe_state_mapping[google_attendee['responseStatus']]
+                attendee['state'] = google_attendee['responseStatus']
                 attendee_record.append((0, 0, attendee))                
         UTC = pytz.timezone('UTC')
         if single_event_dict.get('start') and single_event_dict.get('end'): # If not cancelled   
diff --git a/addons/google_calendar/google_calendar.pyc b/addons/google_calendar/google_calendar.pyc
index 0f8fa4b4387a1353353b59c7c4a89efdf5ad9a06..d195d21b1e88005b89eb6fa611bdda5efc238819 100644
GIT binary patch
delta 5809
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

delta 6029
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
Le7+T28Law0Bp0aL

diff --git a/addons/google_calendar/static/src/js/calendar_sync.js b/addons/google_calendar/static/src/js/calendar_sync.js
index 76570caad4f..d1f742f5629 100644
--- a/addons/google_calendar/static/src/js/calendar_sync.js
+++ b/addons/google_calendar/static/src/js/calendar_sync.js
@@ -42,8 +42,8 @@ openerp.google_calendar = function(instance) {
                 else if (o.status == "NeedRefresh"){
                     self.$calendar.fullCalendar('refetchEvents');
                 }
-                $('div.oe_cal_sync_button').prop('disabled',false);
-            });
+
+            }).always(function(o) { $('div.oe_cal_sync_button').prop('disabled',false); });
         }
     });