odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Add type url in pad,for share add act_window option of active_id. 

bzr revid: vda@tinyerp.com-20110120060215-ih3ia6b3j068uty5
This commit is contained in:
vda (Open ERP) 2011-01-20 11:32:15 +05:30
parent 2e4efe2677
commit 68b23d5226
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/pad/web/controllers.py
View File

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

6
addons/share/web/controllers.py
View File

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

9
addons/share/web/editors.py
View File

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