From 0fc106106f5b7a7e7e8dad0e40d429781552a5bf Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 15 Jul 2013 17:18:18 +0530
Subject: [PATCH] [IMP]: code

bzr revid: aja@tinyerp.com-20130715114818-h5vbfv6vncsvtrga
---
 addons/base_calendar/base_calendar.py               | 4 ++--
 addons/base_calendar/controllers/main.py            | 4 ++--
 addons/base_calendar/static/src/js/base_calendar.js | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index b845f1e9aa8..5b1c128db3e 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -404,11 +404,11 @@ property or property parameter."),
         return res
 
     def meeting_invitation(self, cr, uid, ids, context=None):
-        attende_obj = self.browse(cr, uid, ids, context=context)
+        meeting_id = self.pool.get('crm.meeting').search(cr, uid, [('attendee_ids','in',ids)])
         action_id = self.pool.get('ir.actions.act_window').search(cr, uid, [('res_model','=','crm.meeting')], context=context)
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)
         if action_id:
-            base_url += '/meeting/meeting_invitation?db=%s&debug=&token=%s&action=%s' % (cr.dbname, ids,action_id[0]);
+            base_url += '/meeting/meeting_invitation?db=%s&token=%s&action=%s&id=%s' % (cr.dbname, ids,action_id[0],meeting_id[0]);
         return base_url
 
     def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context=None):
diff --git a/addons/base_calendar/controllers/main.py b/addons/base_calendar/controllers/main.py
index 599e602b180..7e9828e5729 100644
--- a/addons/base_calendar/controllers/main.py
+++ b/addons/base_calendar/controllers/main.py
@@ -7,7 +7,7 @@ import openerp.addons.web.controllers.main as webmain
 class crm_meetting_importstatus(http.Controller):
 
     @http.route('/meeting/meeting_invitation', type='http', auth="none")
-    def meeting_invitation(self, db, token, action, view_type, status):
+    def meeting_invitation(self, db, token, action, view_type, id, status):
         js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in webmain.manifest_list('js', db=db))
         css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in webmain.manifest_list('css',db=db))
 
@@ -15,7 +15,7 @@ class crm_meetting_importstatus(http.Controller):
             'js': js,
             'css': css,
             'modules': simplejson.dumps(webmain.module_boot(db)),
-            'init': 's.base_calendar.event("%s", "%s", "%s", "%s", "%s");'% (db, token, action, view_type, status),
+            'init': 's.base_calendar.event("%s", "%s", "%s", "%s", "%s", "%s");'% (db, token, action, view_type, id, status),
         }
 
 
diff --git a/addons/base_calendar/static/src/js/base_calendar.js b/addons/base_calendar/static/src/js/base_calendar.js
index 19ac311881c..1b60e6042b6 100644
--- a/addons/base_calendar/static/src/js/base_calendar.js
+++ b/addons/base_calendar/static/src/js/base_calendar.js
@@ -5,13 +5,14 @@ instance.base_calendar = {}
 
     instance.base_calendar.invite = instance.web.Widget.extend({
 
-        init: function(parent,db,token,action,view_type,status) {
+        init: function(parent,db,token,action,view_type,id,status) {
             this._super();
             this.db = db;
             this.token = token;
             this.status = status;
             this.action = action;
             this.view_type = view_type;
+            this.id = id;
         },
         start: function() {
             var self = this;
@@ -48,7 +49,7 @@ instance.base_calendar = {}
             var att_status = "do_decline";
             var self = this;
             var reload_page = function(){
-                return location.replace(_.str.sprintf('/?db=%s#view_type=%s&model=crm.meeting&action=%s&id=%s',self.db,self.view_type,self.action,self.token));
+                return location.replace(_.str.sprintf('/?db=%s#view_type=%s&model=crm.meeting&action=%s&active_id=%s',self.db,self.view_type,self.action,self.id));
             }
             if(self.status === 'accepted'){att_status = "do_accept";}
             var calender_attendee = new instance.web.Model('calendar.attendee')
@@ -198,9 +199,9 @@ instance.base_calendar = {}
     instance.web.form.widgets = instance.web.form.widgets.extend({
         'Many2Many_invite' : 'instance.web.form.Many2Many_invite',
     });
-    instance.base_calendar.event = function (db, token, action, view_type, status) {
+    instance.base_calendar.event = function (db, token, action, view_type, id, status) {
         instance.session.session_bind(instance.session.origin).done(function () {
-            new instance.base_calendar.invite(null,db,token,action,view_type,status).appendTo($("body").addClass('openerp'));
+            new instance.base_calendar.invite(null,db,token,action,view_type,id,status).appendTo($("body").addClass('openerp'));
         });
     }
 };