vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #971 from nabinhait/fix1

Browse source 
Minor fixes: escaped characters
This commit is contained in:
Nabin Hait 2015-01-19 11:11:43 +05:30
commit d9fc13d0e6
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/core/doctype/event/event.py
View file

@ -27,8 +27,8 @@ def get_permission_query_conditions(user):
`tabEvent Role`.parent=tabEvent.name
and `tabEvent Role`.role in ('%(roles)s')))
""" % {
"user": user,
"roles": "', '".join(frappe.get_roles(user))
"user": frappe.db.escape(user),
"roles": "', '".join([frappe.db.escape(r) for r in frappe.get_roles(user)])
}
def has_permission(doc, user):

3
frappe/core/doctype/todo/todo.py
View file

@ -77,7 +77,8 @@ def get_permission_query_conditions(user):
if "System Manager" in frappe.get_roles(user):
return None
else:
return """(tabToDo.owner = '{user}' or tabToDo.assigned_by = '{user}')""".format(user=user)
return """(tabToDo.owner = '{user}' or tabToDo.assigned_by = '{user}')"""\
.format(user=frappe.db.escape(user))
def has_permission(doc, user):
if "System Manager" in frappe.get_roles(user):

4
frappe/test_runner.py
View file

@ -187,11 +187,11 @@ def make_test_objects(doctype, test_records, verbose=None):
records = []
if not frappe.get_meta(doctype).issingle:
existing = frappe.get_list(doctype, filters={"name":("like", "_T-" + doctype + "-%")})
existing = frappe.get_all(doctype, filters={"name":("like", "_T-" + doctype + "-%")})
if existing:
return [d.name for d in existing]
existing = frappe.get_list(doctype, filters={"name":("like", "_Test " + doctype + "%")})
existing = frappe.get_all(doctype, filters={"name":("like", "_Test " + doctype + "%")})
if existing:
return [d.name for d in existing]