@@ -1 +1 @@ | |||||
skips: ['B605', 'B404', 'B603', 'B607'] | |||||
skips: ['E0203', 'B605', 'B404', 'B603', 'B607'] |
@@ -2,7 +2,7 @@ | |||||
// For license information, please see license.txt | // For license information, please see license.txt | ||||
frappe.ui.form.on('Comment', { | frappe.ui.form.on('Comment', { | ||||
refresh: function(frm) { | |||||
// refresh: function(frm) { | |||||
} | |||||
// } | |||||
}); | }); |
@@ -150,7 +150,7 @@ def update_comments_in_parent(reference_doctype, reference_name, _comments): | |||||
try: | try: | ||||
# use sql, so that we do not mess with the timestamp | # use sql, so that we do not mess with the timestamp | ||||
frappe.db.sql("""update `tab{0}` set `_comments`=%s where name=%s""".format(reference_doctype), | frappe.db.sql("""update `tab{0}` set `_comments`=%s where name=%s""".format(reference_doctype), | ||||
(json.dumps(_comments), reference_name)) | |||||
(json.dumps(_comments[-50:]), reference_name)) # nosec | |||||
except Exception as e: | except Exception as e: | ||||
if frappe.db.is_column_missing(e) and getattr(frappe.local, 'request', None): | if frappe.db.is_column_missing(e) and getattr(frappe.local, 'request', None): | ||||
@@ -32,10 +32,26 @@ class TestComment(unittest.TestCase): | |||||
from frappe.website.doctype.blog_post.test_blog_post import make_test_blog | from frappe.website.doctype.blog_post.test_blog_post import make_test_blog | ||||
test_blog = make_test_blog() | test_blog = make_test_blog() | ||||
frappe.db.sql("delete from `tabComment` where reference_doctype = 'Blog Post'") | |||||
from frappe.templates.includes.comments.comments import add_comment | from frappe.templates.includes.comments.comments import add_comment | ||||
add_comment('hello', 'test@test.com', 'Good Tester', | add_comment('hello', 'test@test.com', 'Good Tester', | ||||
'Blog Post', test_blog.name, test_blog.route) | 'Blog Post', test_blog.name, test_blog.route) | ||||
self.assertEqual(frappe.get_all('Comment', fields = ['*'], filters = dict( | |||||
reference_doctype = test_blog.doctype, | |||||
reference_name = test_blog.name | |||||
))[0].published, 1) | |||||
frappe.db.sql("delete from `tabComment` where reference_doctype = 'Blog Post'") | |||||
add_comment('pleez vizits my site http://mysite.com', 'test@test.com', 'bad commentor', | |||||
'Blog Post', test_blog.name, test_blog.route) | |||||
self.assertEqual(frappe.get_all('Comment', fields = ['*'], filters = dict( | |||||
reference_doctype = test_blog.doctype, | |||||
reference_name = test_blog.name | |||||
))[0].published, 0) | |||||
@@ -285,7 +285,7 @@ def delete_references(doctype, reference_doctype, reference_name, | |||||
reference_doctype_field = 'reference_doctype', reference_name_field = 'reference_name'): | reference_doctype_field = 'reference_doctype', reference_name_field = 'reference_name'): | ||||
frappe.db.sql('''delete from `tab{0}` | frappe.db.sql('''delete from `tab{0}` | ||||
where {1}=%s and {2}=%s'''.format(doctype, reference_doctype_field, reference_name_field), | where {1}=%s and {2}=%s'''.format(doctype, reference_doctype_field, reference_name_field), | ||||
(reference_doctype, reference_name)) | |||||
(reference_doctype, reference_name)) # nosec | |||||
def clear_references(doctype, reference_doctype, reference_name, | def clear_references(doctype, reference_doctype, reference_name, | ||||
reference_doctype_field = 'reference_doctype', reference_name_field = 'reference_name'): | reference_doctype_field = 'reference_doctype', reference_name_field = 'reference_name'): | ||||
@@ -295,7 +295,7 @@ def clear_references(doctype, reference_doctype, reference_name, | |||||
{1}=NULL, {2}=NULL | {1}=NULL, {2}=NULL | ||||
where | where | ||||
{1}=%s and {2}=%s'''.format(doctype, reference_doctype_field, reference_name_field), | {1}=%s and {2}=%s'''.format(doctype, reference_doctype_field, reference_name_field), | ||||
(reference_doctype, reference_name)) | |||||
(reference_doctype, reference_name)) # nosec | |||||
def insert_feed(doc): | def insert_feed(doc): | ||||
@@ -397,7 +397,7 @@ frappe.Application = Class.extend({ | |||||
} | } | ||||
}); | }); | ||||
dialog.set_primary_action(__('Login'), () => { | dialog.set_primary_action(__('Login'), () => { | ||||
me.dialog.set_message(__('Authenticating...')); | |||||
dialog.set_message(__('Authenticating...')); | |||||
frappe.call({ | frappe.call({ | ||||
method: 'login', | method: 'login', | ||||
args: { | args: { | ||||
@@ -39,7 +39,7 @@ def make_test_blog(): | |||||
category_name = 'Test Blog Category', | category_name = 'Test Blog Category', | ||||
title='Test Blog Category')).insert() | title='Test Blog Category')).insert() | ||||
if not frappe.db.exists('Blogger', 'test-blogger'): | if not frappe.db.exists('Blogger', 'test-blogger'): | ||||
blogger = frappe.get_doc(dict( | |||||
frappe.get_doc(dict( | |||||
doctype = 'Blogger', | doctype = 'Blogger', | ||||
short_name='test-blogger', | short_name='test-blogger', | ||||
full_name='Test Blogger')).insert() | full_name='Test Blogger')).insert() | ||||