vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #774 from anandpdoshi/anand-august-13

Browse source 
Moved Social Login Keys doctype to Website module
This commit is contained in:
Anand Doshi 2014-08-13 19:26:13 +05:30
commit 20466ca6d5
7 changed files with 85 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/config/setup.py
View file

@ -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",

5
frappe/config/website.py
View file

@ -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."),
}
]
},
]

79
frappe/core/doctype/social_login_keys/social_login_keys.json
View file

@ -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
}
]
}

2
frappe/templates/pages/login.py
View file

@ -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"),

0
frappe/core/doctype/social_login_keys/__init__.py → frappe/website/doctype/social_login_keys/__init__.py
View file

79
frappe/website/doctype/social_login_keys/social_login_keys.json Normal file
View file

@ -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
}
]
}

0
frappe/core/doctype/social_login_keys/social_login_keys.py → frappe/website/doctype/social_login_keys/social_login_keys.py
View file