pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] upstream

Browse Source 
bzr revid: fme@openerp.com-20131028091527-hbki8epj0oh4s821
This commit is contained in:
Fabien Meghazi
2013-10-28 10:15:27 +01:00
parent eb7b1362cd 77e79435d0
commit 321bf56b99
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/controllers/main.py
+2 -2
View File
@@ -130,7 +130,7 @@ class Website(openerp.addons.web.controllers.main.Home):
html = request.website.render('website.404', values)
return html
@website.route('/website/customize_template_toggle', type='json', auth='admin') # FIXME: auth
@website.route('/website/customize_template_toggle', type='json', auth='user')
def customize_template_set(self, view_id):
view_obj = request.registry.get("ir.ui.view")
view = view_obj.browse(request.cr, request.uid, int(view_id),
@@ -144,7 +144,7 @@ class Website(openerp.addons.web.controllers.main.Home):
}, context=request.context)
return True
@website.route('/website/customize_template_get', type='json', auth='admin') # FIXME: auth
@website.route('/website/customize_template_get', type='json', auth='user')
def customize_template_get(self, xml_id, optional=True):
imd = request.registry['ir.model.data']
view_model, view_theme_id = imd.get_object_reference(
addons/website/static/src/js/website.editor.js
-1
View File
@@ -517,7 +517,6 @@
fetch_editables: function (root) {
return $(root).find('[data-oe-model]')
// FIXME: propagation should make "meta" blocks non-editable in the first place...
.not('link, script')
.not('.oe_snippet_editor')
.filter(function () {
addons/website_blog/security/ir.model.access.csv
+4 -2
View File
@@ -1,5 +1,7 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
blog_category_all,blog.category,model_blog_category,,1,0,0,0
blog_post_all,blog.post,model_blog_post,,1,0,0,0
blog_post,blog.post,model_blog_post,base.group_user,1,1,1,1
blog_post_history,blog.post.history,model_blog_post_history,base.group_user,1,0,1,0
blog_post,blog.post,model_blog_post,base.group_document_user,1,1,1,1
blog_post_history,blog.post.history,model_blog_post_history,base.group_document_user,1,0,1,0
blog_tag,blog.tag,model_blog_tag,,1,0,0,0
blog_tag_edition,blog.tag,model_blog_tag,base.group_document_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 blog_category_all blog.category model_blog_category 1 0 0 0
3 blog_post_all blog.post model_blog_post 1 0 0 0
4 blog_post blog.post model_blog_post base.group_user base.group_document_user 1 1 1 1
5 blog_post_history blog.post.history model_blog_post_history base.group_user base.group_document_user 1 0 1 0
6 blog_tag blog.tag model_blog_tag 1 0 0 0
7 blog_tag_edition blog.tag model_blog_tag base.group_document_user 1 1 1 1