[REV] share: 4340 changes

bzr revid: xmo@openerp.com-20110120110738-nupvsxcefaugaysg
This commit is contained in:
Xavier Morel 2011-01-20 12:07:38 +01:00
parent cda9789c02
commit 21724da22b
2 changed files with 5 additions and 10 deletions

View File

@ -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)

View File

@ -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(),
}));
});
});