From a2fdef2c506e65c27d7c96133e086dc0b7f2fb12 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 27 Nov 2014 12:33:40 +0530
Subject: [PATCH] [fixes] complete signup and email footer frappe/erpnext#2433

---
 frappe/database.py                              | 1 +
 frappe/email/doctype/email_alert/email_alert.py | 8 --------
 frappe/public/css/bootstrap.css                 | 1 -
 frappe/templates/pages/complete_signup.html     | 5 +++--
 frappe/templates/pages/login.py                 | 7 ++++---
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/frappe/database.py b/frappe/database.py
index 3df1fc6c12..d4d19908a9 100644
--- a/frappe/database.py
+++ b/frappe/database.py
@@ -457,6 +457,7 @@ class Database:
 		"""Return the temperory value and delete it."""
 		value = self.get_global(key, "__temp")
 		frappe.defaults.clear_default(key=key, parent="__temp")
+		return value
 
 	def set_global(self, key, val, user='__global'):
 		"""Save a global key value. Global values will be automatically set if they match fieldname."""
diff --git a/frappe/email/doctype/email_alert/email_alert.py b/frappe/email/doctype/email_alert/email_alert.py
index ea5021db8b..6591f17b32 100644
--- a/frappe/email/doctype/email_alert/email_alert.py
+++ b/frappe/email/doctype/email_alert/email_alert.py
@@ -89,15 +89,7 @@ def evaluate_alert(doc, alert, event):
 	if not recipients:
 		return
 
-	template = alert.message + footer
 	# send alert
 	frappe.sendmail(recipients=recipients, subject=alert.subject,
 		message= frappe.render_template(template, {"doc": doc, "alert":alert}),
 		bulk=True, ref_doctype = doc.doctype, ref_docname = doc.name)
-
-
-footer = """<div style='margin-top: 20px; font-size: 80%; color: #888'>
-This Email Alert <em>{{alert.subject}}</em> was autogenerated for
-{{ doc.doctype }} <a href="/desk#Form/{{doc.doctype}}/{{doc.name}}">{{doc.name}}</a>.
-To update, modify it, go to Setup > Email > <a href="/desk#List/Email Alert">Email Alert</a>
-"""
diff --git a/frappe/public/css/bootstrap.css b/frappe/public/css/bootstrap.css
index 0f2279b25b..75041280ae 100644
--- a/frappe/public/css/bootstrap.css
+++ b/frappe/public/css/bootstrap.css
@@ -6365,4 +6365,3 @@ a:hover,
 a:focus {
   text-decoration: none;
 }
-/*# sourceMappingURL=bootstrap.css.map */
diff --git a/frappe/templates/pages/complete_signup.html b/frappe/templates/pages/complete_signup.html
index cc9f5daaad..b504bcf298 100644
--- a/frappe/templates/pages/complete_signup.html
+++ b/frappe/templates/pages/complete_signup.html
@@ -2,10 +2,11 @@
 
 {% block content %}
 <div class="login-content container" style="max-width: 800px;">
-	<form role="form" method="POST" action="/api/method/frappe.templates.pages.login.login_oauth_user">
+	<form role="form form-signin" method="POST"
+        action="/api/method/frappe.templates.pages.login.login_oauth_user">
 		<h2 class="form-signin-heading">{{ _("One Last Step") }}</h2>
         <input type="hidden" name="key" value="{{ frappe.form_dict.key }}">
-		<input type="email" id="email_id"
+		<input type="email" id="email_id" name="email_id"
 			class="form-control" placeholder="{{ _('Email Id') }}" required autofocus>
 		<br>
 		<button class="btn btn-primary btn-complete-signup" type="submit">{{ _("Complete") }}</button>
diff --git a/frappe/templates/pages/login.py b/frappe/templates/pages/login.py
index fab0e0a298..f8bb87f2b6 100644
--- a/frappe/templates/pages/login.py
+++ b/frappe/templates/pages/login.py
@@ -159,15 +159,16 @@ def login_via_oauth2(provider, code, decoder=None):
 
 	login_oauth_user(info, provider=provider)
 
-@frappe.whitelist()
+@frappe.whitelist(allow_guest=True)
 def login_oauth_user(data=None, provider=None, email_id=None, key=None):
 	if email_id and key:
-		data = frappe.db.get_temp(key)
+		data = json.loads(frappe.db.get_temp(key))
 		data["email"] = email_id
 
 	elif not "email" in data:
 		# ask for user email
-		key = frappe.db.set_temp(data)
+		key = frappe.db.set_temp(json.dumps(data))
+		frappe.db.commit()
 		frappe.local.response["type"] = "redirect"
 		frappe.local.response["location"] = "/complete_signup?key=" + key
 		return