From 022a912ecd23721a2002b8fa919e21b7b5d8c488 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Wed, 13 Aug 2014 17:12:32 +0530
Subject: [PATCH] Moved Social Login Keys doctype to Website module

---
 frappe/config/setup.py                        |  5 --
 frappe/config/website.py                      |  5 ++
 .../social_login_keys/social_login_keys.json  | 79 -------------------
 frappe/templates/pages/login.py               |  2 +-
 .../doctype/social_login_keys/__init__.py     |  0
 .../social_login_keys/social_login_keys.json  | 79 +++++++++++++++++++
 .../social_login_keys/social_login_keys.py    |  0
 7 files changed, 85 insertions(+), 85 deletions(-)
 delete mode 100644 frappe/core/doctype/social_login_keys/social_login_keys.json
 rename frappe/{core => website}/doctype/social_login_keys/__init__.py (100%)
 create mode 100644 frappe/website/doctype/social_login_keys/social_login_keys.json
 rename frappe/{core => website}/doctype/social_login_keys/social_login_keys.py (100%)

diff --git a/frappe/config/setup.py b/frappe/config/setup.py
index 2588f656f3..1a8079f1ed 100644
--- a/frappe/config/setup.py
+++ b/frappe/config/setup.py
@@ -191,11 +191,6 @@ def get_data():
 					"description": _("Send download link of a recent backup to System Managers"),
 					"hide_count": True
 				},
-				{
-					"type": "doctype",
-					"name": "Social Login Keys",
-					"description": _("Enter keys to enable login via Facebook, Google, GitHub."),
-				},
 				{
 					"type": "doctype",
 					"name": "Backup Manager",
diff --git a/frappe/config/website.py b/frappe/config/website.py
index 4adc17afd9..25ef53cb64 100644
--- a/frappe/config/website.py
+++ b/frappe/config/website.py
@@ -89,6 +89,11 @@ def get_data():
 					"name": "Website Page Permission",
 					"description": _("Define read, write, admin permissions for a Website Page."),
 				},
+				{
+					"type": "doctype",
+					"name": "Social Login Keys",
+					"description": _("Enter keys to enable login via Facebook, Google, GitHub."),
+				}
 			]
 		},
 	]
diff --git a/frappe/core/doctype/social_login_keys/social_login_keys.json b/frappe/core/doctype/social_login_keys/social_login_keys.json
deleted file mode 100644
index 98c0190754..0000000000
--- a/frappe/core/doctype/social_login_keys/social_login_keys.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
- "creation": "2014-03-04 08:29:52.000000", 
- "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": "2014-03-04 08:47:32.000000", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "Social Login Keys", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "create": 1, 
-   "permlevel": 0, 
-   "read": 1, 
-   "role": "System Manager", 
-   "write": 1
-  }
- ]
-}
\ No newline at end of file
diff --git a/frappe/templates/pages/login.py b/frappe/templates/pages/login.py
index 861b5ee141..2e7b536b43 100644
--- a/frappe/templates/pages/login.py
+++ b/frappe/templates/pages/login.py
@@ -199,7 +199,7 @@ def update_oauth_user(user, data, provider):
 			"first_name": data.get("first_name") or data.get("given_name") or data.get("name"),
 			"last_name": data.get("last_name") or data.get("family_name"),
 			"email": data["email"],
-			"gender": data.get("gender" or "").title(),
+			"gender": (data.get("gender") or "").title(),
 			"enabled": 1,
 			"new_password": frappe.generate_hash(data["email"]),
 			"location": data.get("location"),
diff --git a/frappe/core/doctype/social_login_keys/__init__.py b/frappe/website/doctype/social_login_keys/__init__.py
similarity index 100%
rename from frappe/core/doctype/social_login_keys/__init__.py
rename to frappe/website/doctype/social_login_keys/__init__.py
diff --git a/frappe/website/doctype/social_login_keys/social_login_keys.json b/frappe/website/doctype/social_login_keys/social_login_keys.json
new file mode 100644
index 0000000000..ad0e984ad3
--- /dev/null
+++ b/frappe/website/doctype/social_login_keys/social_login_keys.json
@@ -0,0 +1,79 @@
+{
+ "creation": "2014-03-04 08:29:52.000000",
+ "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": "2014-08-13 08:47:32.000000",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Social Login Keys",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "permlevel": 0,
+   "read": 1,
+   "role": "System Manager",
+   "write": 1
+  }
+ ]
+}
diff --git a/frappe/core/doctype/social_login_keys/social_login_keys.py b/frappe/website/doctype/social_login_keys/social_login_keys.py
similarity index 100%
rename from frappe/core/doctype/social_login_keys/social_login_keys.py
rename to frappe/website/doctype/social_login_keys/social_login_keys.py