This survey is open only to registered people. Please log in.
+
+
+
+
+
+
diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index 0e1fe2beb89..6c466355d07 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -25,6 +25,7 @@ import openerp.modules
import openerp
from openerp.osv import orm, fields
from openerp.tools import ustr, DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools import html_escape as escape
from openerp.addons.web.http import request
from openerp.addons.base.ir import ir_qweb
@@ -276,7 +277,7 @@ class Image(orm.AbstractModel):
url_params[options_key] = options[options_key]
return ir_qweb.HTMLSafe('' % (
- ' '.join(itertools.imap(werkzeug.utils.escape, classes)),
+ ' '.join(itertools.imap(escape, classes)),
werkzeug.urls.url_encode(url_params)
))
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index db02dcce51e..4cda81c7448 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -27,6 +27,7 @@ except ImportError:
import openerp
from openerp.osv import orm, osv, fields
+from openerp.tools import html_escape as escape
from openerp.tools.safe_eval import safe_eval
from openerp.addons.web.http import request
@@ -710,7 +711,7 @@ class ir_attachment(osv.osv):
for attachment in self.browse(cr, uid, ids, context=context):
# in-document URLs are html-escaped, a straight search will not
# find them
- url = werkzeug.utils.escape(attachment.website_url)
+ url = escape(attachment.website_url)
ids = Views.search(cr, uid, ["|", ('arch', 'like', '"%s"' % url), ('arch', 'like', "'%s'" % url)], context=context)
if ids:
diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py
index b2e689e5cb6..f2d5af47e36 100644
--- a/addons/website_event_track/controllers/event.py
+++ b/addons/website_event_track/controllers/event.py
@@ -24,9 +24,9 @@ import datetime
import re
import pytz
-import werkzeug.utils
import openerp
+import openerp.tools
from openerp.addons.web import http
from openerp.addons.web.http import request
@@ -150,7 +150,7 @@ class website_event(http.Controller):
if post.get('tag_'+str(tag.id)):
tags.append(tag.id)
- e = werkzeug.utils.escape
+ e = openerp.tools.escape
track_description = '''
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index d2f86625e70..e13564a6a5e 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -346,10 +346,10 @@ class WebsiteForum(http.Controller):
if not request.session.uid:
return {'error': 'anonymous_user'}
user = request.registry['res.users'].browse(request.cr, SUPERUSER_ID, request.uid, context=request.context)
- if post.parent_id.create_uid.id != uid:
- return {'error': 'own_post'}
+ if post.parent_id.create_uid.id != uid and user.karma < request.registry['forum.forum']._karma_answer_accept_all:
+ return {'error': 'not_enough_karma', 'karma': request.registry['forum.forum']._karma_answer_accept_all}
if post.create_uid.id == user.id and user.karma < request.registry['forum.forum']._karma_answer_accept_own:
- return {'error': 'not_enough_karma', 'karma': 20}
+ return {'error': 'not_enough_karma', 'karma': request.registry['forum.forum']._karma_answer_accept_own}
# set all answers to False, only one can be accepted
request.registry['forum.post'].write(cr, uid, [c.id for c in post.parent_id.child_ids], {'is_correct': False}, context=context)
diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index 0b45d4311c1..9d4e9e587c9 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -54,15 +54,10 @@ $(document).ready(function () {
''+
'Sorry, anonymous users cannot choose correct answer.'+
'
');
- } else if (data['error'] == 'own_post'){
- var $warning = $('
'+
- ''+
- 'Sorry, only the user who asked this question can accept the answer as correct.'+
- '
');
} else if (data['error'] == 'not_enough_karma') {
var $warning = $('
'+
''+
- 'Sorry, at least ' + data['karma'] + ' karma is required to accept your own answers. You can gain karma by answering questions and receiving votes.'+
+ 'Sorry, at least ' + data['karma'] + ' karma is required to accept this answer. You can gain karma by answering questions and receiving votes.'+
'