diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 205ad1ca3dc..c614268ca07 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -405,15 +405,12 @@ property or property parameter."),
res = cal.serialize()
return res
- def meeting_invitation(self, cr, uid, ids,context=None):
- partner_obj = self.browse(cr,uid, ids,context=context)
- action_id=self.pool.get('ir.actions.act_window').search(cr, uid, [('res_model','=','crm.meeting')], context=context)
+ def meeting_invitation(self, cr, uid, ids, context=None):
+ attende_obj = self.browse(cr, uid, ids, context=context)
+ 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)
- for partner in partner_obj:
- if partner and partner.ref.user_id:
- base_url += '/meeting/meeting_invitation?db=%s&debug=&token=%s&action=%s' % (cr.dbname, ids[0],action_id[0]);
- else :
- base_url += "/auth_signup"
+ for attende in attende_obj:
+ base_url += '/meeting/meeting_invitation?db=%s&debug=&token=%s&action=%s' % (cr.dbname, ids[0],action_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 4762ededd05..0ddff888cd8 100644
--- a/addons/base_calendar/controllers/main.py
+++ b/addons/base_calendar/controllers/main.py
@@ -1,21 +1,20 @@
import simplejson
import urllib
-import openerp.addons.web.http as oeweb
+import openerp.addons.web.http as http
+from openerp.addons.web.http import request
import openerp.addons.web.controllers.main as webmain
-class crm_meetting_importstatus(oeweb.Controller):
- _cp_path = '/meeting'
+class crm_meetting_importstatus(http.Controller):
- @oeweb.httprequest
- def meeting_invitation(self, req, db, token, action, status):
- print 'FFFFFFFFFFFFF'
- js = "\n ".join('' % i for i in webmain.manifest_list(req,'js', db=db))
- css = "\n ".join('' % i for i in webmain.manifest_list(req,'css',db=db))
+ @http.route('/meeting/meeting_invitation', type='http', auth="none")
+ def meeting_invitation(self, db, token, action, status):
+ js = "\n ".join('' % i for i in webmain.manifest_list('js', db=db))
+ css = "\n ".join('' % i for i in webmain.manifest_list('css',db=db))
return webmain.html_template % {
'js': js,
'css': css,
- 'modules': simplejson.dumps(webmain.module_boot(req, db)),
+ 'modules': simplejson.dumps(webmain.module_boot(db)),
'init': 's.base_calendar.do_accept("%s","%s", "%s", "%s");'% (db,token,action,status),
}