diff options
| author | vda (Open ERP) <vda@tinyerp.com> | 2011-01-20 11:32:15 +0530 |
|---|---|---|
| committer | vda (Open ERP) <vda@tinyerp.com> | 2011-01-20 11:32:15 +0530 |
| commit | 68b23d52268d47f05ab19c89a467c2fbf590872d (patch) | |
| tree | e6b0c914ca330dd659aa505b117b12fe1ded8d9d /addons | |
| parent | 2e4efe2677cb9fdec8d971f5481cb19a28e206e9 (diff) | |
[FIX] Add type url in pad,for share add act_window option of active_id.
bzr revid: vda@tinyerp.com-20110120060215-ih3ia6b3j068uty5
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/pad/web/controllers.py | 1 | ||||
| -rw-r--r-- | addons/share/web/controllers.py | 6 | ||||
| -rw-r--r-- | addons/share/web/editors.py | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/addons/pad/web/controllers.py b/addons/pad/web/controllers.py index faa5d0ad54b..1553d721303 100644 --- a/addons/pad/web/controllers.py +++ b/addons/pad/web/controllers.py @@ -30,5 +30,6 @@ class Piratepad(openerp.controllers.SecuredController): attachment_id = rpc.RPCProxy('ir.attachment').create({ 'name': pad_name, 'url': pad_link, + 'type': 'url' }, ctx) return {'id': attachment_id, 'name': pad_name, 'url': pad_link} diff --git a/addons/share/web/controllers.py b/addons/share/web/controllers.py index de44d0ecac3..efa360036ea 100644 --- a/addons/share/web/controllers.py +++ b/addons/share/web/controllers.py @@ -13,13 +13,17 @@ class ShareWizardController(openerp.controllers.SecuredController): _cp_path = "/share" @expose() - def index(self, domain, search_domain, context, name): + def index(self, domain, search_domain, context, name, view_type): context = ast.literal_eval(context) view_name = context.get('_terp_view_name') or name if not view_name: return action_id = rpc.RPCProxy('ir.actions.actions').search( [('name','=',view_name)], 0, 0, 0, context) + + if not action_id: + action_id = rpc.RPCProxy('ir.actions.act_window').search([('view_type','=', view_type),('name','=',view_name)], 0, 0, 0, context) + if not action_id: return domain = ast.literal_eval(domain) diff --git a/addons/share/web/editors.py b/addons/share/web/editors.py index d156d40c6b3..73475042ca3 100644 --- a/addons/share/web/editors.py +++ b/addons/share/web/editors.py @@ -24,10 +24,11 @@ class ShareActionEditor(openobject.templating.TemplateEditor): jQuery(this).attr( "href", openobject.http.getURL('/share', { - context: jQuery("#_terp_context").val(), - domain: jQuery("#_terp_domain").val(), - name: jQuery("#_terp_string").val(), - search_domain: jQuery("#_terp_search_domain").val(), + context: jQuery(idSelector("_terp_context")).val(), + domain: jQuery(idSelector("_terp_domain")).val(), + name: jQuery(idSelector("_terp_string")).val(), + view_type: jQuery(idSelector("_terp_view_type")).val(), + search_domain: jQuery(idSelector("_terp_search_domain")).val(), })); }); }); |