pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]: code

Browse Source 
bzr revid: aja@tinyerp.com-20130715114818-h5vbfv6vncsvtrga
This commit is contained in:
ajay javiya (OpenERP)
2013-07-15 17:18:18 +05:30
parent e9eceecf19
commit 0fc106106f
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_calendar/base_calendar.py
+2 -2
View File
@@ -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):
addons/base_calendar/controllers/main.py
+2 -2
View File
@@ -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),
}
addons/base_calendar/static/src/js/base_calendar.js
+5 -4
View File
@@ -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'));
});
}
};