Page missing or moved
We are very sorry for this, but the page you are looking for is missing diff --git a/webnotes/__init__.py b/webnotes/__init__.py index e27c978257..64afdefd35 100644 --- a/webnotes/__init__.py +++ b/webnotes/__init__.py @@ -245,13 +245,16 @@ def get_roles(user=None, with_standard=True): return roles -def has_permission(doctype, ptype="read", doc=None): +def has_permission(doctype, ptype="read", refdoc=None): """check if user has permission""" from webnotes.defaults import get_user_default_as_list if session.user=="Administrator": return True if conn.get_value("DocType", doctype, "istable"): return True + if isinstance(refdoc, basestring): + refdoc = doc(doctype, refdoc) + perms = conn.sql("""select `name`, `match` from tabDocPerm p where p.parent = %s and ifnull(p.`%s`,0) = 1 @@ -259,7 +262,7 @@ def has_permission(doctype, ptype="read", doc=None): and (p.role="All" or p.role in (select `role` from tabUserRole where `parent`=%s)) """ % ("%s", ptype, "%s"), (doctype, session.user), as_dict=1) - if doc: + if refdoc: match_failed = {} for p in perms: if p.match: @@ -268,11 +271,11 @@ def has_permission(doctype, ptype="read", doc=None): else: keys = [p.match, p.match] - if doc.fields.get(keys[0],"[No Value]") \ + if refdoc.fields.get(keys[0],"[No Value]") \ in get_user_default_as_list(keys[1]): return True else: - match_failed[keys[0]] = doc.fields.get(keys[0],"[No Value]") + match_failed[keys[0]] = refdoc.fields.get(keys[0],"[No Value]") else: # found a permission without a match return True diff --git a/webnotes/model/mapper.py b/webnotes/model/mapper.py index 6e326daca5..53b02fdcc0 100644 --- a/webnotes/model/mapper.py +++ b/webnotes/model/mapper.py @@ -33,15 +33,18 @@ def get_mapped_doclist(from_doctype, from_docname, table_maps, target_doclist=[] source = webnotes.bean(from_doctype, from_docname) - if not ignore_permissions and not webnotes.has_permission(from_doctype, doc=source.doc): + if not ignore_permissions and not webnotes.has_permission(from_doctype, "read", source.doc): webnotes.msgprint("No Permission", raise_exception=webnotes.PermissionError) source_meta = webnotes.get_doctype(from_doctype) target_meta = webnotes.get_doctype(table_maps[from_doctype]["doctype"]) - + # main if target_doclist: - target_doc = webnotes.doc(target_doclist[0]) + if isinstance(target_doclist[0], dict): + target_doc = webnotes.doc(fielddata=target_doclist[0]) + else: + target_doc = target_doclist[0] else: target_doc = webnotes.new_doc(table_maps[from_doctype]["doctype"]) @@ -99,10 +102,19 @@ def map_doc(source_doc, target_doc, table_map, source_meta, target_meta, source_ # map other fields - for source_key, target_key in table_map.get("field_map", {}).items(): - val = source_doc.fields.get(source_key) - if val not in (None, ""): - target_doc.fields[target_key] = val + field_map = table_map.get("field_map") + + if field_map: + if isinstance(field_map, dict): + for source_key, target_key in field_map.items(): + val = source_doc.fields.get(source_key) + if val not in (None, ""): + target_doc.fields[target_key] = val + else: + for fmap in field_map: + val = source_doc.fields.get(fmap[0]) + if val not in (None, ""): + target_doc.fields[fmap[1]] = val # map idx if source_doc.idx: diff --git a/webnotes/widgets/reportview.py b/webnotes/widgets/reportview.py index 0e710f3cc1..7c22ed36fc 100644 --- a/webnotes/widgets/reportview.py +++ b/webnotes/widgets/reportview.py @@ -172,6 +172,8 @@ def build_conditions(doctype, fields, filters, docstatus): def build_filter_conditions(filters, conditions): """build conditions from user filters""" from webnotes.utils import cstr + global tables + if not tables: tables = [] for f in filters: if isinstance(f, basestring): @@ -182,7 +184,7 @@ def build_filter_conditions(filters, conditions): tables.append(tname) # prepare in condition - if f[2]=='in': + if f[2] in ['in', 'not in']: opts = ["'" + t.strip().replace("'", "\\'") + "'" for t in f[3].split(',')] f[3] = "(" + ', '.join(opts) + ")" conditions.append(tname + '.' + f[1] + " " + f[2] + " " + f[3]) diff --git a/webnotes/widgets/search.py b/webnotes/widgets/search.py index 22a42c5912..49d2eb937d 100644 --- a/webnotes/widgets/search.py +++ b/webnotes/widgets/search.py @@ -30,8 +30,8 @@ from startup.query_handlers import standard_queries # this is called by the Link Field @webnotes.whitelist() -def search_link(dt, txt, query=None, filters=None): - search_widget(dt, txt, query, page_len=10, filters=filters) +def search_link(doctype, txt, query=None, filters=None): + search_widget(doctype, txt, query, page_len=10, filters=filters) webnotes.response['results'] = build_for_autosuggest(webnotes.response["values"]) # this is called by the search box