diff options
| author | Kirti Savalia (OpenERP) <ksa@tinyerp.com> | 2011-12-21 18:38:05 +0530 |
|---|---|---|
| committer | Kirti Savalia (OpenERP) <ksa@tinyerp.com> | 2011-12-21 18:38:05 +0530 |
| commit | 9f6b438bb1ff5444064e8b0d5097936f16c30b01 (patch) | |
| tree | 823331fb3fac0a1506000175439ec2e4ee4a7a86 /addons/plugin/plugin_handler.py | |
| parent | 4623fd2461f02aa4e50aae806c89cdecfa690d71 (diff) | |
| parent | 35f64fe1e4b06e48633b81d52567c4bdce50cac6 (diff) | |
[MERGE]:with latest addons
bzr revid: ksa@tinyerp.com-20111221130805-h8j2x1cokuqzrezd
Diffstat (limited to 'addons/plugin/plugin_handler.py')
| -rw-r--r-- | addons/plugin/plugin_handler.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py index fd5ca7da6c6..1fccae814b2 100644 --- a/addons/plugin/plugin_handler.py +++ b/addons/plugin/plugin_handler.py @@ -12,13 +12,14 @@ class plugin_handler(osv.osv_memory): def _make_url(self, cr, uid, res_id, model, context=None): """ - @param id: on which document the message is pushed + @param res_id: on which document the message is pushed @param model: name of the document linked with the mail @return url """ base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context) if base_url: - base_url += '/?id=%s&model=%s'%(res_id,model) + user = self.pool.get('res.users').browse(cr, uid, uid, context=context) + base_url += '/web/webclient/login?db=%s&login=%s&key=%s#id=%s&model=%s' % (cr.dbname, user.login, user.password, res_id, model) return base_url def is_installed(self, cr, uid): @@ -53,7 +54,7 @@ class plugin_handler(osv.osv_memory): res_id = msg.res_id model = msg.model url = self._make_url(cr, uid, res_id, model) - name = self.pool.get(model).name_get(cr, uid, res_id)[0][1] + name = self.pool.get(model).name_get(cr, uid, [res_id])[0][1] return (model,res_id, url,name) |