diff --git a/addons/share/web/controllers.py b/addons/share/web/controllers.py index efa360036ea..de44d0ecac3 100644 --- a/addons/share/web/controllers.py +++ b/addons/share/web/controllers.py @@ -13,17 +13,13 @@ class ShareWizardController(openerp.controllers.SecuredController): _cp_path = "/share" @expose() - def index(self, domain, search_domain, context, name, view_type): + def index(self, domain, search_domain, context, name): 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 73475042ca3..d156d40c6b3 100644 --- a/addons/share/web/editors.py +++ b/addons/share/web/editors.py @@ -24,11 +24,10 @@ class ShareActionEditor(openobject.templating.TemplateEditor): jQuery(this).attr( "href", openobject.http.getURL('/share', { - 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(), + context: jQuery("#_terp_context").val(), + domain: jQuery("#_terp_domain").val(), + name: jQuery("#_terp_string").val(), + search_domain: jQuery("#_terp_search_domain").val(), })); }); });