{%= data.fullname %}
– {%= data.comment_on %}
{% if(data.doctype=="Communication") { %}
- –
- {%= __("Details") %}
+ –
+
+ {% if (data.delivery_status) {
+ if (in_list(["Sent", "Opened", "Clicked"], data.delivery_status)) {
+ var indicator_class = "green";
+ } else {
+ var indicator_class = "red";
+ }
+ %}
+
+ {%= data.delivery_status %}
+
+ {% } else { %} {%= __("Details") %} {% } %}
+
{%= __("Reply") %}
{% } %}
diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 7371d5ee7c..a4df87f059 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -53,6 +53,14 @@ frappe.ui.form.Grid = Class.extend({
var me = this,
$rows = $(me.parent).find(".rows"),
data = this.get_data();
+
+ if (this.frm && this.frm.docname) {
+ // use doc specific docfield object
+ this.df = frappe.meta.get_docfield(this.frm.doctype, this.df.fieldname, this.frm.docname);
+ } else {
+ // use non-doc specific docfield
+ this.df = frappe.meta.get_docfield(this.df.options, this.df.fieldname);
+ }
this.docfields = frappe.meta.get_docfields(this.doctype, this.frm.docname);
this.display_status = frappe.perm.get_field_display_status(this.df, this.frm.doc,
diff --git a/frappe/public/js/frappe/ui/page.html b/frappe/public/js/frappe/ui/page.html
index 188d79290c..adf6a52039 100644
--- a/frappe/public/js/frappe/ui/page.html
+++ b/frappe/public/js/frappe/ui/page.html
@@ -10,7 +10,7 @@
-
+
diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index 917fdb16d1..b5b6d4a980 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -209,3 +209,18 @@ select.form-control {
font-weight: bold;
background-color: @light-yellow;
}
+
+.form-headline .alert {
+ font-size: @text-medium;
+ border-color: @border-color;
+ // background-color: @light-bg;
+ margin-bottom: 0px;
+}
+
+.delivery-status-indicator {
+ display: inline-block;
+ margin-top: -3px;
+ margin-left: 1px;
+ font-weight: 500;
+ color: @text-muted;
+}
diff --git a/frappe/public/less/variables.less b/frappe/public/less/variables.less
index 9f45f24f33..3cdd084e3a 100644
--- a/frappe/public/less/variables.less
+++ b/frappe/public/less/variables.less
@@ -10,6 +10,7 @@
@modal-backdrop-bg: #334143;
@light-yellow: #fffce7;
@text-extra-muted: @border-color;
+@text-regular: 14px;
@text-medium: 12px;
@text-small: 10px;
diff --git a/frappe/sessions.py b/frappe/sessions.py
index b611ab3984..0763a82742 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -32,7 +32,7 @@ def clear_cache(user=None):
cache = frappe.cache()
groups = ("bootinfo", "user_recent", "user_roles", "user_doc", "lang",
- "defaults", "user_permissions", "roles")
+ "defaults", "user_permissions", "roles", "home_page")
if user:
for name in groups:
diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py
index 1dbe5d0787..a3112eb481 100644
--- a/frappe/utils/boilerplate.py
+++ b/frappe/utils/boilerplate.py
@@ -82,7 +82,7 @@ def make_boilerplate(dest, app_name):
with open(os.path.join(dest, hooks.app_name, hooks.app_name, "config", "desktop.py"), "w") as f:
f.write(encode(desktop_template.format(**hooks)))
-
+ print "'{app}' created at {path}".format(app=app_name, path=os.path.join(dest, app_name))
manifest_template = """include MANIFEST.in
diff --git a/frappe/utils/redis_wrapper.py b/frappe/utils/redis_wrapper.py
index 2469a7b900..7d5cd9ed0c 100644
--- a/frappe/utils/redis_wrapper.py
+++ b/frappe/utils/redis_wrapper.py
@@ -136,8 +136,15 @@ class RedisWrapper(redis.Redis):
except redis.exceptions.ConnectionError:
pass
+ def hdel_keys(self, name_starts_with, key):
+ """Delete hash names with wildcard `*` and key"""
+ for name in frappe.cache().get_keys(name_starts_with):
+ name = name.split("|", 1)[1]
+ self.hdel(name, key)
+
def hkeys(self, name):
try:
return super(redis.Redis, self).hkeys(self.make_key(name))
except redis.exceptions.ConnectionError:
return []
+
diff --git a/frappe/website/doctype/social_login_keys/social_login_keys.json b/frappe/website/doctype/social_login_keys/social_login_keys.json
deleted file mode 100644
index e032acf7a2..0000000000
--- a/frappe/website/doctype/social_login_keys/social_login_keys.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
- "creation": "2014-03-04 08:29:52",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "System",
- "fields": [
- {
- "fieldname": "facebook",
- "fieldtype": "Section Break",
- "label": "Facebook",
- "permlevel": 0
- },
- {
- "fieldname": "facebook_client_id",
- "fieldtype": "Data",
- "label": "Facebook Client ID",
- "permlevel": 0
- },
- {
- "fieldname": "facebook_client_secret",
- "fieldtype": "Data",
- "label": "Facebook Client Secret",
- "permlevel": 0
- },
- {
- "fieldname": "google",
- "fieldtype": "Section Break",
- "label": "Google",
- "permlevel": 0
- },
- {
- "fieldname": "google_client_id",
- "fieldtype": "Data",
- "label": "Google Client ID",
- "permlevel": 0
- },
- {
- "fieldname": "google_client_secret",
- "fieldtype": "Data",
- "label": "Google Client Secret",
- "permlevel": 0
- },
- {
- "fieldname": "github",
- "fieldtype": "Section Break",
- "label": "GitHub",
- "permlevel": 0
- },
- {
- "fieldname": "github_client_id",
- "fieldtype": "Data",
- "label": "GitHub Client ID",
- "permlevel": 0
- },
- {
- "fieldname": "github_client_secret",
- "fieldtype": "Data",
- "label": "GitHub Client Secret",
- "permlevel": 0
- }
- ],
- "icon": "icon-signin",
- "idx": 1,
- "issingle": 1,
- "modified": "2015-02-05 05:11:46.875246",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "Social Login Keys",
- "owner": "Administrator",
- "permissions": [
- {
- "create": 1,
- "permlevel": 0,
- "read": 1,
- "role": "System Manager",
- "share": 1,
- "write": 1
- }
- ]
-}
\ No newline at end of file
diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py
index a715686cbd..890b00782e 100644
--- a/frappe/website/doctype/web_form/web_form.py
+++ b/frappe/website/doctype/web_form/web_form.py
@@ -41,6 +41,9 @@ class WebForm(WebsiteGenerator):
name = frappe.db.get_value(self.doc_type, {"owner": frappe.session.user}, "name")
if name:
frappe.form_dict.name = name
+ else:
+ # only a single doc allowed and no existing doc, hence new
+ frappe.form_dict.new = 1
# always render new form if login is not required or doesn't allow editing existing ones
if not self.login_required or not self.allow_edit:
diff --git a/frappe/website/render.py b/frappe/website/render.py
index 9735a55544..e06f7b12b9 100644
--- a/frappe/website/render.py
+++ b/frappe/website/render.py
@@ -217,6 +217,7 @@ def clear_cache(path=None):
clear_sitemap()
frappe.clear_cache("Guest")
frappe.cache().delete_value("_website_pages")
+ frappe.cache().delete_value("home_page")
for method in frappe.get_hooks("website_clear_cache"):
frappe.get_attr(method)(path)
diff --git a/frappe/website/template.py b/frappe/website/template.py
index 92ac2022b0..e9aa826244 100644
--- a/frappe/website/template.py
+++ b/frappe/website/template.py
@@ -59,8 +59,10 @@ def set_breadcrumbs(out, context):
"""Build breadcrumbs template (deprecated)"""
out["no_breadcrumbs"] = context.get("no_breadcrumbs", 0) or ("" in out.get("content", ""))
- # breadcrumbs
- if not out["no_breadcrumbs"] and "breadcrumbs" not in out:
+ if out["no_breadcrumbs"]:
+ out["breadcrumbs"] = ""
+
+ elif "breadcrumbs" not in out:
out["breadcrumbs"] = frappe.get_template("templates/includes/breadcrumbs.html").render(context)
def set_title_and_header(out, context):
diff --git a/requirements.txt b/requirements.txt
index 8520a37397..833206829e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,3 +29,4 @@ email_reply_parser
click
num2words
gevent-socketio
+watchdog==0.8.0
diff --git a/setup.py b/setup.py
index 796367e206..befca47c82 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = "6.0.0-wip"
+version = "6.0.0"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()