From 8e3ea4e1f620f9ed77ddbb235b423724923a799c Mon Sep 17 00:00:00 2001 From: Zlash65 Date: Wed, 10 Oct 2018 17:28:20 +0530 Subject: [PATCH 1/3] add email of the owner to email field --- .../doctype/developer_sprint/developer_sprint.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/foundation/erpnext_foundation/doctype/developer_sprint/developer_sprint.py b/foundation/erpnext_foundation/doctype/developer_sprint/developer_sprint.py index e0888318..8b541dfe 100644 --- a/foundation/erpnext_foundation/doctype/developer_sprint/developer_sprint.py +++ b/foundation/erpnext_foundation/doctype/developer_sprint/developer_sprint.py @@ -12,3 +12,7 @@ class DeveloperSprint(Document): autoname = 'DEV-SPRINT-.YYYY.-.###' self.name = make_autoname(autoname) + def validate(self): + self.year = '2018' + if self.owner not in ["Guest", "Administrator"] and not self.get("email"): + self.email = frappe.db.get_value('User', self.owner, "email") \ No newline at end of file From 6ac064815a82ded222615e894832cf29da42f821 Mon Sep 17 00:00:00 2001 From: Zlash65 Date: Wed, 10 Oct 2018 17:28:55 +0530 Subject: [PATCH 2/3] make fields mandatory in webform, change label of dev sprint name --- .../developer_sprint/developer_sprint.json | 7 +++--- .../developer_sprint/developer_sprint.json | 25 ++++++------------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/foundation/erpnext_foundation/doctype/developer_sprint/developer_sprint.json b/foundation/erpnext_foundation/doctype/developer_sprint/developer_sprint.json index 768dda05..72e4f89c 100644 --- a/foundation/erpnext_foundation/doctype/developer_sprint/developer_sprint.json +++ b/foundation/erpnext_foundation/doctype/developer_sprint/developer_sprint.json @@ -1,5 +1,6 @@ { "allow_copy": 0, + "allow_events_in_timeline": 0, "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, @@ -19,7 +20,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "teamcompanychapter_name", + "fieldname": "person_team_name", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, @@ -28,7 +29,7 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Team/Company/Chapter Name", + "label": "Person / Team / Company / Chapter Name", "length": 0, "no_copy": 0, "permlevel": 0, @@ -184,7 +185,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-10-09 16:22:00.627261", + "modified": "2018-10-10 17:26:07.389705", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "Developer Sprint", diff --git a/foundation/erpnext_foundation/web_form/developer_sprint/developer_sprint.json b/foundation/erpnext_foundation/web_form/developer_sprint/developer_sprint.json index 389fe180..8b3e2140 100644 --- a/foundation/erpnext_foundation/web_form/developer_sprint/developer_sprint.json +++ b/foundation/erpnext_foundation/web_form/developer_sprint/developer_sprint.json @@ -18,7 +18,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2018-10-09 16:27:18.317370", + "modified": "2018-10-10 17:27:02.097741", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "developer-sprint", @@ -26,6 +26,7 @@ "payment_button_label": "Buy Now", "published": 1, "route": "developer-sprint", + "show_attachments": 0, "show_in_grid": 0, "show_sidebar": 1, "sidebar_items": [], @@ -35,22 +36,10 @@ "web_form_fields": [ { "allow_read_on_all_link_options": 0, - "fieldname": "teamcompanychapter_name", + "fieldname": "person_team_name", "fieldtype": "Data", "hidden": 0, - "label": "Team/Company/Chapter Name", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 0, - "show_in_filter": 0 - }, - { - "allow_read_on_all_link_options": 0, - "fieldname": "email_id", - "fieldtype": "Data", - "hidden": 0, - "label": "Email ID", + "label": "Person / Team / Company / Chapter Name", "max_length": 0, "max_value": 0, "read_only": 0, @@ -66,7 +55,7 @@ "max_length": 0, "max_value": 0, "read_only": 0, - "reqd": 0, + "reqd": 1, "show_in_filter": 0 }, { @@ -78,7 +67,7 @@ "max_length": 0, "max_value": 0, "read_only": 0, - "reqd": 0, + "reqd": 1, "show_in_filter": 0 }, { @@ -91,7 +80,7 @@ "max_length": 0, "max_value": 0, "read_only": 0, - "reqd": 0, + "reqd": 1, "show_in_filter": 0 } ] From 14f3a37bb9b1150c2fe8c0ff89c8b1de807c0119 Mon Sep 17 00:00:00 2001 From: Zlash65 Date: Wed, 10 Oct 2018 18:12:50 +0530 Subject: [PATCH 3/3] show success message and route to conference 2018 page --- .../conference_talk_proposal.json | 8 +++++--- .../web_form/developer_sprint/developer_sprint.json | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/foundation/erpnext_foundation/web_form/conference_talk_proposal/conference_talk_proposal.json b/foundation/erpnext_foundation/web_form/conference_talk_proposal/conference_talk_proposal.json index 1be3aed8..7e641454 100644 --- a/foundation/erpnext_foundation/web_form/conference_talk_proposal/conference_talk_proposal.json +++ b/foundation/erpnext_foundation/web_form/conference_talk_proposal/conference_talk_proposal.json @@ -17,7 +17,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2018-10-09 16:27:05.686309", + "modified": "2018-10-10 18:21:55.971259", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "conference-talk-proposal", @@ -25,11 +25,13 @@ "payment_button_label": "Buy Now", "published": 1, "route": "propose-a-talk", + "route_to_success_link": 1, + "show_attachments": 0, "show_in_grid": 0, "show_sidebar": 1, "sidebar_items": [], - "success_message": "Thank you for your proposal.", - "success_url": "/conference-talk-proposal", + "success_message": "Thank you for submitting your proposal.", + "success_url": "/conf/2018", "title": "Propose A Talk", "web_form_fields": [ { diff --git a/foundation/erpnext_foundation/web_form/developer_sprint/developer_sprint.json b/foundation/erpnext_foundation/web_form/developer_sprint/developer_sprint.json index 8b3e2140..cd298aa1 100644 --- a/foundation/erpnext_foundation/web_form/developer_sprint/developer_sprint.json +++ b/foundation/erpnext_foundation/web_form/developer_sprint/developer_sprint.json @@ -18,7 +18,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2018-10-10 17:27:02.097741", + "modified": "2018-10-10 18:21:49.734218", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "developer-sprint", @@ -26,12 +26,13 @@ "payment_button_label": "Buy Now", "published": 1, "route": "developer-sprint", + "route_to_success_link": 1, "show_attachments": 0, "show_in_grid": 0, "show_sidebar": 1, "sidebar_items": [], - "success_message": "Thank you for your proposal.", - "success_url": "/developer-sprint", + "success_message": "Thank you for submitting your proposal for the Developer Sprint. See you on the 24th of October!", + "success_url": "/conf/2018", "title": "Developer Sprint", "web_form_fields": [ {