naming_series: - By Naming Series (field called naming_series must be present
Prompt - Prompt user for a name
[series] - Series by prefix (separated by a dot); for example PRE.#####
\n
format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####} - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.
naming_series: - By Naming Series (field called naming_series must be present
Prompt - Prompt user for a name
[series] - Series by prefix (separated by a dot); for example PRE.#####
\n
format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####} - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.
- {{_("Seems ldap is not installed on system. Guidelines to install ldap dependancies and python package")}},
- {{_("Click here")}},
-
- """
- frappe.throw(msg, title=_("LDAP Not Installed"))
+def get_ldap_client_settings():
+ #return the settings to be used on the client side.
+ result = {
+ "enabled": False
+ }
+ settings = frappe.get_doc("LDAP Settings")
- except ldap.LDAPError:
- conn.unbind_s()
- frappe.throw(_("Incorrect UserId or Password"))
+ if settings and settings.enabled:
+ result["enabled"] = True
+ result["method"] = "frappe.integrations.doctype.ldap_settings.ldap_settings.login"
+ return result
-def get_ldap_settings():
+
+def connect_to_ldap(server_url,
+ base_dn,
+ password,
+ ssl_tls_mode,
+ trusted_cert,
+ private_key_file,
+ server_cert_file,
+ ca_certs_file):
try:
- settings = frappe.get_doc("LDAP Settings")
+ import ldap3
+ import ssl
+
+ if trusted_cert == 'Yes':
+ tls_configuration = ldap3.Tls(validate=ssl.CERT_REQUIRED,
+ version=ssl.PROTOCOL_TLSv1)
+ else:
+ tls_configuration = ldap3.Tls(validate=ssl.CERT_NONE,
+ version=ssl.PROTOCOL_TLSv1)
+
+ if private_key_file:
+ tls_configuration.private_key_file = private_key_file
+ if server_cert_file:
+ tls_configuration.certificate_file = server_cert_file
+ if ca_certs_file:
+ tls_configuration.ca_certs_file = ca_certs_file
+
+ server = ldap3.Server(host=server_url,
+ tls=tls_configuration)
+ bind_type = ldap3.AUTO_BIND_TLS_BEFORE_BIND if ssl_tls_mode == "StartTLS" else True
+
+ conn = ldap3.Connection(server=server,
+ user=base_dn,
+ password=password,
+ auto_bind=bind_type,
+ read_only=True,
+ raise_exceptions=True)
+
+ return conn
+
+ except ImportError:
+ msg = _("Please Install the ldap3 library via pip to use ldap functionality.")
+ frappe.throw(msg, title=_("LDAP Not Installed"))
+ except ldap3.core.exceptions.LDAPInvalidCredentialsResult:
+ frappe.throw(_("Invalid Credentials"))
+ except Exception as ex:
+ frappe.throw(_(str(ex)))
- settings.update({
- "method": "frappe.integrations.doctype.ldap_settings.ldap_settings.login"
- })
- return settings
- except Exception:
- # this will return blank settings
- return frappe._dict()
@frappe.whitelist(allow_guest=True)
def login():
- #### LDAP LOGIN LOGIC #####
+ # LDAP LOGIN LOGIC
args = frappe.form_dict
user = authenticate_ldap_user(frappe.as_unicode(args.usr), frappe.as_unicode(args.pwd))
@@ -64,64 +101,57 @@ def login():
# because of a GET request!
frappe.db.commit()
-def authenticate_ldap_user(user=None, password=None):
- dn = None
+
+def authenticate_ldap_user(user=None,
+ password=None):
+
params = {}
- settings = get_ldap_settings()
+ settings = frappe.get_doc("LDAP Settings")
+ if settings and settings.enabled:
+ conn = connect_to_ldap(server_url=settings.ldap_server_url,
+ base_dn=settings.base_dn,
+ password=settings.get_password(raise_exception=False),
+ ssl_tls_mode=settings.ssl_tls_mode,
+ trusted_cert=settings.require_trusted_certificate,
+ private_key_file=settings.local_private_key_file,
+ server_cert_file=settings.local_server_certificate_file,
+ ca_certs_file=settings.local_ca_certs_file)
- try:
- import ldap
- except:
- msg = """
-
- {{_("Seems ldap is not installed on system.")}}
- {{_("Click here")}},
- {{_("Guidelines to install ldap dependancies and python")}}
-
- """
- frappe.throw(msg, title=_("LDAP Not Installed"))
+ user_filter = settings.ldap_search_string.format(user)
+ conn.search(search_base=settings.organizational_unit,
+ search_filter="({0})".format(user_filter),
+ attributes=[settings.ldap_email_field,
+ settings.ldap_username_field,
+ settings.ldap_first_name_field])
- conn = ldap.initialize(settings.ldap_server_url)
-
- try:
- try:
- # set TLS settings for secure connection
- if settings.ssl_tls_mode == 'StartTLS':
- conn.set_option(ldap.OPT_X_TLS_DEMAND, True)
- if settings.require_trusted_certificate == 'Yes':
- conn.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND)
- conn.start_tls_s()
- except:
- frappe.throw(_("StartTLS is not supported"))
-
- # simple_bind_s is synchronous binding to server, it takes two param DN and password
- conn.simple_bind_s(settings.base_dn, settings.get_password(raise_exception=False))
-
- #search for surnames beginning with a
- #available options for how deep a search you want.
- #LDAP_SCOPE_BASE, LDAP_SCOPE_ONELEVEL,LDAP_SCOPE_SUBTREE,
- result = conn.search_s(settings.organizational_unit, ldap.SCOPE_SUBTREE,
- settings.ldap_search_string.format(user))
-
- for dn, r in result:
- dn = cstr(dn)
- params["email"] = cstr(r[settings.ldap_email_field][0])
- params["username"] = cstr(r[settings.ldap_username_field][0])
- params["first_name"] = cstr(r[settings.ldap_first_name_field][0])
-
- if dn:
- conn.simple_bind_s(dn, frappe.as_unicode(password))
+ if len(conn.entries) > 0 and conn.entries[0]:
+ user = conn.entries[0]
+ params["email"] = str(user[settings.ldap_email_field])
+ params["username"] = str(user[settings.ldap_username_field])
+ params["first_name"] = str(user[settings.ldap_first_name_field])
+ connect_to_ldap(server_url=settings.ldap_server_url,
+ base_dn=user.entry_dn,
+ password=frappe.as_unicode(password),
+ ssl_tls_mode=settings.ssl_tls_mode,
+ trusted_cert=settings.require_trusted_certificate,
+ private_key_file=settings.local_private_key_file,
+ server_cert_file=settings.local_server_certificate_file,
+ ca_certs_file=settings.local_ca_certs_file
+ )
return create_user(params)
else:
frappe.throw(_("Not a valid LDAP user"))
+ else:
+ frappe.throw(_("LDAP is not enabled."))
- except ldap.LDAPError:
- conn.unbind_s()
- frappe.throw(_("Incorrect UserId or Password"))
def create_user(params):
if frappe.db.exists("User", params["email"]):
- return frappe.get_doc("User", params["email"])
+ user = frappe.get_doc("User", params["email"])
+ user.first_name = params["first_name"]
+ user.username = params["username"]
+ user.save(ignore_permissions=True)
+ return user
else:
params.update({
@@ -135,6 +165,5 @@ def create_user(params):
})
user = frappe.get_doc(params).insert(ignore_permissions=True)
- frappe.db.commit()
return user
diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py
index 5f804e3c36..40e8616f12 100644
--- a/frappe/model/__init__.py
+++ b/frappe/model/__init__.py
@@ -76,27 +76,50 @@ def delete_fields(args_dict, delete=0):
args_dict = { dt: [field names] }
"""
import frappe.utils
- for dt in list(args_dict):
+ for dt in args_dict:
fields = args_dict[dt]
- if not fields: continue
+ if not fields:
+ continue
- frappe.db.sql("""\
+ frappe.db.sql("""
DELETE FROM `tabDocField`
- WHERE parent=%s AND fieldname IN (%s)
- """ % ('%s', ", ".join(['"' + f + '"' for f in fields])), dt)
+ WHERE parent='%s' AND fieldname IN (%s)
+ """ % (dt, ", ".join(["'{}'".format(f) for f in fields])))
- # Delete the data / column only if delete is specified
- if not delete: continue
+ # Delete the data/column only if delete is specified
+ if not delete:
+ continue
if frappe.db.get_value("DocType", dt, "issingle"):
- frappe.db.sql("""\
+ frappe.db.sql("""
DELETE FROM `tabSingles`
- WHERE doctype=%s AND field IN (%s)
- """ % ('%s', ", ".join(['"' + f + '"' for f in fields])), dt)
+ WHERE doctype='%s' AND field IN (%s)
+ """ % (dt, ", ".join(["'{}'".format(f) for f in fields])))
else:
- existing_fields = frappe.db.sql("desc `tab%s`" % dt)
+ existing_fields = frappe.db.multisql({
+ "mariadb": "DESC `tab%s`" % dt,
+ "postgres": """
+ SELECT
+ COLUMN_NAME
+ FROM
+ information_schema.COLUMNS
+ WHERE
+ TABLE_NAME = 'tab%s';
+ """ % dt,
+ })
existing_fields = existing_fields and [e[0] for e in existing_fields] or []
+ fields_need_to_delete = set(fields) & set(existing_fields)
+ if not fields_need_to_delete:
+ continue
+
+ if frappe.conf.db_type == 'mariadb':
+ # mariadb implicitly commits before DDL, make it explicit
+ frappe.db.commit()
+
query = "ALTER TABLE `tab%s` " % dt + \
- ", ".join(["DROP COLUMN `%s`" % f for f in fields if f in existing_fields])
- frappe.db.commit()
+ ", ".join(["DROP COLUMN `%s`" % f for f in fields_need_to_delete])
frappe.db.sql(query)
+
+ if frappe.conf.db_type == 'postgres':
+ # commit the results to db
+ frappe.db.commit()
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 8b03a21a2b..ae4bc07b1a 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -197,7 +197,7 @@ class BaseDocument(object):
return value
- def get_valid_dict(self, sanitize=True, convert_dates_to_str=False):
+ def get_valid_dict(self, sanitize=True, convert_dates_to_str=False, ignore_nulls = False):
d = frappe._dict()
for fieldname in self.meta.get_valid_columns():
d[fieldname] = self.get(fieldname)
@@ -234,6 +234,9 @@ class BaseDocument(object):
if convert_dates_to_str and isinstance(d[fieldname], (datetime.datetime, datetime.time, datetime.timedelta)):
d[fieldname] = str(d[fieldname])
+ if d[fieldname] == None and ignore_nulls:
+ del d[fieldname]
+
return d
def init_valid_columns(self):
@@ -306,7 +309,8 @@ class BaseDocument(object):
self.creation = self.modified = now()
self.created_by = self.modified_by = frappe.session.user
- d = self.get_valid_dict(convert_dates_to_str=True)
+ # if doctype is "DocType", don't insert null values as we don't know who is valid yet
+ d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in ('DocType', 'DocField', 'DocPerm'))
columns = list(d)
try:
@@ -341,7 +345,7 @@ class BaseDocument(object):
self.db_insert()
return
- d = self.get_valid_dict(convert_dates_to_str=True)
+ d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in ('DocType', 'DocField', 'DocPerm'))
# don't update name, as case might've been changed
name = d['name']
diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index 5dc74bff8d..cdf099e50e 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -278,9 +278,8 @@ def delete_dynamic_links(doctype, name):
delete_references('Document Follow', doctype, name, 'ref_doctype', 'ref_docname')
# unlink communications
+ clear_timeline_references(doctype, name)
clear_references('Communication', doctype, name)
- clear_references('Communication', doctype, name, 'link_doctype', 'link_name')
- clear_references('Communication', doctype, name, 'timeline_doctype', 'timeline_name')
clear_references('Activity Log', doctype, name)
clear_references('Activity Log', doctype, name, 'timeline_doctype', 'timeline_name')
@@ -301,6 +300,9 @@ def clear_references(doctype, reference_doctype, reference_name,
{1}=%s and {2}=%s'''.format(doctype, reference_doctype_field, reference_name_field), # nosec
(reference_doctype, reference_name))
+def clear_timeline_references(link_doctype, link_name):
+ frappe.db.sql("""delete from `tabCommunication Link`
+ where `tabCommunication Link`.link_doctype='{0}' and `tabCommunication Link`.link_name='{1}'""".format(link_doctype, link_name)) # nosec
def insert_feed(doc):
from frappe.utils import get_fullname
diff --git a/frappe/model/document.py b/frappe/model/document.py
index e8add2d619..3ed3118571 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -1195,18 +1195,10 @@ class Document(BaseDocument):
return
# update timeline doc in communication if it is different than current timeline doc
- frappe.db.sql("""update `tabCommunication`
- set timeline_doctype=%(timeline_doctype)s, timeline_name=%(timeline_name)s
- where
- reference_doctype=%(doctype)s and reference_name=%(name)s
- and (timeline_doctype is null or timeline_doctype != %(timeline_doctype)s
- or timeline_name is null or timeline_name != %(timeline_name)s)""",
- {
- "doctype": self.doctype,
- "name": self.name,
- "timeline_doctype": timeline_doctype,
- "timeline_name": timeline_name
- })
+ communication = frappe.get_doc("Communication", {"reference_doctype": self.doctype, "reference_name": self.name})
+ if communication.communication_medium == "Email":
+ # duplicate entries will be handled by deduplicate links in communication
+ communication.add_link(link_doctype=timeline_doctype, link_name=timeline_name, autosave=True)
def queue_action(self, action, **kwargs):
'''Run an action in background. If the action has an inner function,
diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py
index a373554696..12c57f2780 100644
--- a/frappe/model/rename_doc.py
+++ b/frappe/model/rename_doc.py
@@ -161,7 +161,7 @@ def validate_rename(doctype, new, meta, merge, force, ignore_permissions):
if (not merge) and exists:
frappe.msgprint(_("Another {0} with name {1} exists, select another name").format(doctype, new), raise_exception=1)
- if not (ignore_permissions or frappe.has_permission(doctype, "write")):
+ if not (ignore_permissions or frappe.permissions.has_permission(doctype, "write", raise_exception=False)):
frappe.msgprint(_("You need write permission to rename"), raise_exception=1)
if not (force or ignore_permissions) and not meta.allow_rename:
diff --git a/frappe/patches.txt b/frappe/patches.txt
index c0b2a8238f..82a33920f3 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -241,3 +241,6 @@ frappe.patches.v12_0.reset_home_settings
frappe.patches.v12_0.update_print_format_type
frappe.patches.v11_0.remove_doctype_user_permissions_for_page_and_report #2019-05-01
frappe.patches.v12_0.remove_feedback_rating
+execute:frappe.reload_doc('core', 'doctype', 'communication_link')
+execute:frappe.reload_doc('core', 'doctype', 'communication')
+frappe.patches.v12_0.move_timeline_links_to_dynamic_links
\ No newline at end of file
diff --git a/frappe/patches/v11_0/set_default_letter_head_source.py b/frappe/patches/v11_0/set_default_letter_head_source.py
index 069f4e3d2e..a43ea397e4 100644
--- a/frappe/patches/v11_0/set_default_letter_head_source.py
+++ b/frappe/patches/v11_0/set_default_letter_head_source.py
@@ -6,4 +6,4 @@ def execute():
frappe.reload_doctype('Letter Head')
# source of all existing letter heads must be HTML
- frappe.db.sql('update `tabLetter Head` set source = "HTML"')
\ No newline at end of file
+ frappe.db.sql("update `tabLetter Head` set source = 'HTML'")
diff --git a/frappe/patches/v12_0/init_desk_settings.py b/frappe/patches/v12_0/init_desk_settings.py
index 782ced8a26..31c6cf9207 100644
--- a/frappe/patches/v12_0/init_desk_settings.py
+++ b/frappe/patches/v12_0/init_desk_settings.py
@@ -8,4 +8,4 @@ from frappe.desk.moduleview import get_onboard_items
def execute():
"""Reset the initial customizations for desk, with modules, indices and links."""
frappe.reload_doc("core", "doctype", "user")
- frappe.db.sql("""update tabUser set home_settings = %s""", (''), debug=True)
+ frappe.db.sql("""update `tabUser` set home_settings = %s""", (''), debug=True)
diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
new file mode 100644
index 0000000000..8860c7c00d
--- /dev/null
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -0,0 +1,44 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def execute():
+ communications = frappe.db.sql("""
+ SELECT
+ `tabCommunication`.name, `tabCommunication`.creation, `tabCommunication`.modified,
+ `tabCommunication`.modified_by,`tabCommunication`.timeline_doctype, `tabCommunication`.timeline_name,
+ `tabCommunication`.link_doctype, `tabCommunication`.link_name
+ FROM `tabCommunication`
+ WHERE `tabCommunication`.communication_medium='Email'
+ """, as_dict=True)
+
+ name = 1000000000
+ values = []
+
+ for count, communication in enumerate(communications):
+ counter = 1
+ if communication.timeline_doctype and communication.timeline_name:
+ name += 1
+ values.append("""({0}, "{1}", "timeline_links", "Communication", "{2}", "{3}", "{4}", "{5}", "{6}", "{7}")""".format(
+ counter, str(name), communication.name, communication.timeline_doctype,
+ communication.timeline_name, communication.creation, communication.modified, communication.modified_by
+ ))
+ counter += 1
+ if communication.link_doctype and communication.link_name:
+ name += 1
+ values.append("""({0}, "{1}", "timeline_links", "Communication", "{2}", "{3}", "{4}", "{5}", "{6}", "{7}")""".format(
+ counter, str(name), communication.name, communication.link_doctype,
+ communication.link_name, communication.creation, communication.modified, communication.modified_by
+ ))
+
+ if values and (count % 10000 == 0 or count == len(communications) - 1):
+ frappe.db.sql("""
+ INSERT INTO `tabCommunication Link`
+ (`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
+ `modified`, `modified_by`)
+ VALUES {0}
+ """.format(", ".join([d for d in values])))
+
+ values = []
+
+ frappe.db.add_index("Communication Link", ["link_doctype", "link_name"])
\ No newline at end of file
diff --git a/frappe/patches/v12_0/setup_comments_from_communications.py b/frappe/patches/v12_0/setup_comments_from_communications.py
index 1a7a5aef84..b52304bc05 100644
--- a/frappe/patches/v12_0/setup_comments_from_communications.py
+++ b/frappe/patches/v12_0/setup_comments_from_communications.py
@@ -25,4 +25,4 @@ def execute():
new_comment.db_insert()
# clean up
- frappe.db.sql('delete from tabCommunication where communication_type = "Comment"')
\ No newline at end of file
+ frappe.db.sql("delete from `tabCommunication` where communication_type = 'Comment'")
diff --git a/frappe/patches/v12_0/update_print_format_type.py b/frappe/patches/v12_0/update_print_format_type.py
index 33035abc2a..577dc68d94 100644
--- a/frappe/patches/v12_0/update_print_format_type.py
+++ b/frappe/patches/v12_0/update_print_format_type.py
@@ -3,11 +3,11 @@ import frappe
def execute():
frappe.db.sql('''
UPDATE `tabPrint Format`
- SET `print_format_type` = "Jinja"
- WHERE `print_format_type` in ("Server", "Client")
+ SET `print_format_type` = 'Jinja'
+ WHERE `print_format_type` in ('Server', 'Client')
''')
frappe.db.sql('''
UPDATE `tabPrint Format`
- SET `print_format_type` = "JS"
- WHERE `print_format_type` = "Js"
+ SET `print_format_type` = 'JS'
+ WHERE `print_format_type` = 'Js'
''')
diff --git a/frappe/permissions.py b/frappe/permissions.py
index 3809bb3e9c..e5aa31d139 100644
--- a/frappe/permissions.py
+++ b/frappe/permissions.py
@@ -25,16 +25,18 @@ def print_has_permission_check_logs(func):
frappe.flags['has_permission_check_logs'] = []
result = func(*args, **kwargs)
self_perm_check = True if not kwargs.get('user') else kwargs.get('user') == frappe.session.user
+ raise_exception = False if kwargs.get('raise_exception') == False else True
+
# print only if access denied
# and if user is checking his own permission
- if not result and self_perm_check:
+ if not result and self_perm_check and raise_exception:
msgprint((' ').join(frappe.flags.get('has_permission_check_logs')))
frappe.flags.pop('has_permission_check_logs', None)
return result
return inner
@print_has_permission_check_logs
-def has_permission(doctype, ptype="read", doc=None, verbose=False, user=None):
+def has_permission(doctype, ptype="read", doc=None, verbose=False, user=None, raise_exception=True):
"""Returns True if user has permission `ptype` for given `doctype`.
If `doc` is passed, it also checks user, share and owner permissions.
diff --git a/frappe/public/build.json b/frappe/public/build.json
index cd8f04b2c9..a279519d72 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -137,6 +137,11 @@
"public/css/desk-rtl.css",
"public/css/report-rtl.css"
],
+ "css/printview.css": [
+ "public/css/bootstrap.css",
+ "public/css/font-awesome.css",
+ "public/less/print.less"
+ ],
"concat:js/libs.min.js": [
"public/js/lib/awesomplete/awesomplete.min.js",
"public/js/lib/Sortable.min.js",
diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index a7ed3f8a72..750ad7a64c 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -168,13 +168,12 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
}
if(!me.df.only_select) {
- if(frappe.model.can_create(doctype)
- && me.df.fieldtype !== "Dynamic Link") {
+ if(frappe.model.can_create(doctype)) {
// new item
r.results.push({
label: ""
+ " "
- + __("Create a new {0}", [__(me.df.options)])
+ + __("Create a new {0}", [__(me.get_options())])
+ "",
value: "create_new__link_option",
action: me.new_doc
diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index ef6afde262..e616b9ef3e 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -57,7 +57,7 @@ Quill.register(DirectionStyle, true);
frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
make_wrapper() {
this._super();
- this.$wrapper.find(".like-disabled-input").addClass("ql-editor");
+ this.$wrapper.find(".like-disabled-input").addClass('text-editor-print');
},
make_input() {
@@ -198,7 +198,78 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
let $ul = $('
').append($children);
$parent.replaceWith($ul);
});
- value = $value.html();
+ value = this.convertLists($value.html());
return value;
+ },
+
+ // hack
+ // https://github.com/quilljs/quill/issues/979
+ convertLists(richtext) {
+ const tempEl = window.document.createElement('div');
+ tempEl.setAttribute('style', 'display: none;');
+ tempEl.innerHTML = richtext;
+ const startLi = '::startli::';
+ const endLi = '::endli::';
+
+ ['ul','ol'].forEach((type) => {
+ const startTag = `::start${type}::`;
+ const endTag = `::end${type}::`;
+
+ // Grab each list, and work on it in turn
+ Array.from(tempEl.querySelectorAll(type)).forEach((outerListEl) => {
+ const listChildren = Array.from(outerListEl.children).filter((el) => el.tagName === 'LI');
+
+ let lastLiLevel = 0;
+ let currentLiLevel = 0;
+ let difference = 0;
+
+ // Now work through each li in this list
+ for (let i = 0; i < listChildren.length; i++) {
+ const currentLi = listChildren[i];
+ lastLiLevel = currentLiLevel;
+ currentLiLevel = this.getListLevel(currentLi);
+ difference = currentLiLevel - lastLiLevel;
+
+ // we only need to add tags if the level is changing
+ if (difference > 0) {
+ currentLi.before((startLi + startTag).repeat(difference));
+ } else if (difference < 0) {
+ currentLi.before((endTag + endLi).repeat(-difference));
+ }
+
+ if (i === listChildren.length - 1) {
+ // last li, account for the fact that it might not be at level 0
+ currentLi.after((endTag + endLi).repeat(currentLiLevel));
+ }
+ }
+ });
+ });
+
+ // Get the content in the element and replace the temporary tags with new ones
+ let newContent = tempEl.innerHTML;
+
+ newContent = newContent.replace(/::startul::/g, '
\
', perm));
}
-
+ me.perm_dialog.set_title(role);
me.perm_dialog.show();
}
});
@@ -191,7 +191,7 @@ frappe.RoleEditor = Class.extend({
},
make_perm_dialog: function() {
this.perm_dialog = new frappe.ui.Dialog({
- title:__('Role Permissions')
+ title: __('Role Permissions')
});
this.perm_dialog.$wrapper.find('.modal-dialog').css("width", "800px");
diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js
index c0e2d162a6..962adcf344 100644
--- a/frappe/public/js/frappe/ui/link_preview.js
+++ b/frappe/public/js/frappe/ui/link_preview.js
@@ -28,7 +28,9 @@ frappe.ui.LinkPreview = class {
if (this.is_link) {
this.doctype = this.element.attr('data-doctype');
this.name = this.element.attr('data-name');
+ this.href = this.element.attr('href');
} else {
+ this.href = this.element.parents('.control-input-wrapper').find('.control-value a').attr('href');
// input
this.doctype = this.element.attr('data-target');
this.name = this.element.val();
@@ -36,7 +38,11 @@ frappe.ui.LinkPreview = class {
}
setup_popover_control(e) {
- if(!this.popover) {
+ //If control field value is changed, new popover has to be created
+ this.element.on('change',()=> {
+ this.new_popover = true;
+ });
+ if(!this.popover || this.new_popover) {
this.get_preview_fields().then(preview_fields => {
if(preview_fields.length) {
this.data_timeout = setTimeout(() => {
@@ -46,13 +52,21 @@ frappe.ui.LinkPreview = class {
});
} else {
this.popover_timeout = setTimeout(() => {
- this.popover.show();
+ if (this.element.is(':focus')) {
+ return;
+ }
+ this.show_popover(e);
}, 1000);
}
this.handle_popover_hide();
}
create_popover(e, preview_fields) {
+ this.new_popover = false;
+ if (this.element.is(':focus')) {
+ return;
+ }
+
this.get_preview_fields_value(preview_fields).then((preview_data)=> {
if(preview_data) {
if(this.popover_timeout) {
@@ -66,37 +80,37 @@ frappe.ui.LinkPreview = class {
} else {
this.init_preview_popover(preview_data);
}
-
- if(!this.is_link) {
- var left = e.pageX;
- this.element.popover('show');
- var width = $('.popover').width();
- $('.control-field-popover').css('left', (left-(width/2)) + 'px');
- } else {
- this.element.popover('show');
- }
+ this.show_popover(e);
}, 1000);
}
});
}
+ show_popover(e) {
+ if(!this.is_link) {
+ var left = e.pageX;
+ this.element.popover('show');
+ var width = $('.popover').width();
+ $('.control-field-popover').css('left', (left-(width/2)) + 'px');
+ } else {
+ this.element.popover('show');
+ }
+ }
+
handle_popover_hide() {
$(document.body).on('mouseout', this.LINK_CLASSES, () => {
- this.link_hovered = false;
+ // To allow popover to be hovered on
+ if (!$('.popover:hover').length) {
+ this.link_hovered = false;
+ }
if(this.data_timeout) {
clearTimeout(this.data_timeout);
}
if (this.popover_timeout) {
clearTimeout(this.popover_timeout);
}
- this.clear_all_popovers();
- });
-
- $(document.body).on('mousemove', () => {
- if (!this.link_hovered) {
- this.clear_all_popovers();
- }
+ if(!this.link_hovered) this.clear_all_popovers();
});
$(window).on('hashchange', () => {
@@ -113,7 +127,15 @@ frappe.ui.LinkPreview = class {
let dt = this.doctype;
let fields = [];
frappe.model.with_doctype(dt, () => {
- let meta_fields = frappe.get_meta(dt).fields;
+ let meta = frappe.get_meta(dt);
+ let meta_fields = meta.fields;
+
+ if (!meta.show_preview_popup) {
+ // no preview
+ resolve([]);
+ return;
+ }
+
meta_fields.filter((field) => {
// build list of fields to fetch
if(field.in_preview) {
@@ -171,41 +193,48 @@ frappe.ui.LinkPreview = class {
}
let image_html = '';
- let title_html = '';
- let content_html = `
`;
+ let id_html = '';
+ let content_html = '';
+ let meta = frappe.get_meta(this.doctype);
+ let title = preview_data.title;
- if(preview_data['image']) {
- let image_url = encodeURI(preview_data['image']);
+ if(preview_data[meta.image_field]) {
+ let image_url = encodeURI(preview_data[meta.image_field]);
image_html += `