@@ -147,8 +147,8 @@ def set_portal_link(sent_via, comm): | |||||
if is_signup_enabled() and hasattr(sent_via, "get_portal_page"): | if is_signup_enabled() and hasattr(sent_via, "get_portal_page"): | ||||
portal_page = sent_via.get_portal_page() | portal_page = sent_via.get_portal_page() | ||||
if portal_page: | if portal_page: | ||||
is_valid_recipient = cstr(sent_via.email or sent_via.email_id or | |||||
sent_via.contact_email) in comm.recipients | |||||
is_valid_recipient = cstr(sent_via.get("email") or sent_via.get("email_id") or | |||||
sent_via.get("contact_email")) in comm.recipients | |||||
if is_valid_recipient: | if is_valid_recipient: | ||||
url = "%s/%s?name=%s" % (get_url(), portal_page, urllib.quote(sent_via.name)) | url = "%s/%s?name=%s" % (get_url(), portal_page, urllib.quote(sent_via.name)) | ||||
footer = """<!-- Portal Link --><hr> | footer = """<!-- Portal Link --><hr> | ||||
@@ -16,9 +16,6 @@ class CustomizeForm(Document): | |||||
'search_fields': 'Data', | 'search_fields': 'Data', | ||||
'default_print_format': 'Data', | 'default_print_format': 'Data', | ||||
'read_only_onload': 'Check', | 'read_only_onload': 'Check', | ||||
'allow_print': 'Check', | |||||
'allow_email': 'Check', | |||||
'allow_copy': 'Check', | |||||
'allow_attach': 'Check', | 'allow_attach': 'Check', | ||||
'max_attachments': 'Int' | 'max_attachments': 'Int' | ||||
} | } | ||||
@@ -2,9 +2,11 @@ frappe.pages['data-import-tool'].onload = function(wrapper) { | |||||
wrapper.app_page = frappe.ui.make_app_page({ | wrapper.app_page = frappe.ui.make_app_page({ | ||||
parent: wrapper, | parent: wrapper, | ||||
title: __("Data Import / Export Tool"), | title: __("Data Import / Export Tool"), | ||||
icon: "data-import-tool" | |||||
icon: "icon-upload" | |||||
}); | }); | ||||
wrapper.appframe.set_title_left(function() { frappe.set_route(frappe.get_module("Setup").link); }); | |||||
// check permission for import | // check permission for import | ||||
if(!((frappe.boot.user.can_import && frappe.boot.user.can_import.length) || | if(!((frappe.boot.user.can_import && frappe.boot.user.can_import.length) || | ||||
user_roles.indexOf("System Manager")!==-1)) { | user_roles.indexOf("System Manager")!==-1)) { | ||||