From 3f79ced669c05a10ce6f4335935467e8ed7821f7 Mon Sep 17 00:00:00 2001 From: meichthys Date: Tue, 30 Sep 2025 03:41:51 +0000 Subject: [PATCH] update prayer requests & make importable --- .../church_prayer_request.json | 4 ++-- .../church_prayer_request.py | 2 +- .../templates/church_prayer_request.html | 7 +++++++ .../templates/church_prayer_request_row.html | 4 ++++ .../web_form/prayer_request/prayer_request.json | 4 ++-- .../fixtures/church_prayer_request_status.json | 16 ++++++++-------- 6 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 church/church_prayers/doctype/church_prayer_request/templates/church_prayer_request.html create mode 100644 church/church_prayers/doctype/church_prayer_request/templates/church_prayer_request_row.html diff --git a/church/church_prayers/doctype/church_prayer_request/church_prayer_request.json b/church/church_prayers/doctype/church_prayer_request/church_prayer_request.json index bce4b3d..e76f436 100644 --- a/church/church_prayers/doctype/church_prayer_request/church_prayer_request.json +++ b/church/church_prayers/doctype/church_prayer_request/church_prayer_request.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "autoincrement", "creation": "2025-09-13 00:16:52.698863", "description": "A request for prayer from (or for) a `Church Person`.", @@ -81,9 +82,8 @@ } ], "grid_page_length": 50, - "index_web_pages_for_search": 1, "links": [], - "modified": "2025-09-25 22:47:04.584440", + "modified": "2025-09-29 23:30:23.363479", "modified_by": "Administrator", "module": "Church Prayers", "name": "Church Prayer Request", diff --git a/church/church_prayers/doctype/church_prayer_request/church_prayer_request.py b/church/church_prayers/doctype/church_prayer_request/church_prayer_request.py index 2962c16..d73810f 100644 --- a/church/church_prayers/doctype/church_prayer_request/church_prayer_request.py +++ b/church/church_prayers/doctype/church_prayer_request/church_prayer_request.py @@ -2,7 +2,7 @@ # For license information, please see license.txt # import frappe -from frappe.model.document import Document +from frappe.website.website_generator import WebsiteGenerator class ChurchPrayerRequest(Document): diff --git a/church/church_prayers/doctype/church_prayer_request/templates/church_prayer_request.html b/church/church_prayers/doctype/church_prayer_request/templates/church_prayer_request.html new file mode 100644 index 0000000..db12309 --- /dev/null +++ b/church/church_prayers/doctype/church_prayer_request/templates/church_prayer_request.html @@ -0,0 +1,7 @@ +{% extends "templates/web.html" %} + +{% block page_content %} +

{{ title }}

+{% endblock %} + + \ No newline at end of file diff --git a/church/church_prayers/doctype/church_prayer_request/templates/church_prayer_request_row.html b/church/church_prayers/doctype/church_prayer_request/templates/church_prayer_request_row.html new file mode 100644 index 0000000..d7014b4 --- /dev/null +++ b/church/church_prayers/doctype/church_prayer_request/templates/church_prayer_request_row.html @@ -0,0 +1,4 @@ +
+ {{ doc.title or doc.name }} +
+ diff --git a/church/church_prayers/web_form/prayer_request/prayer_request.json b/church/church_prayers/web_form/prayer_request/prayer_request.json index ddd4f5d..4f21812 100644 --- a/church/church_prayers/web_form/prayer_request/prayer_request.json +++ b/church/church_prayers/web_form/prayer_request/prayer_request.json @@ -6,7 +6,7 @@ "allow_multiple": 0, "allow_print": 0, "anonymous": 0, - "apply_document_permissions": 1, + "apply_document_permissions": 0, "button_label": "Save", "condition_json": "[[\"Church Prayer Request\",\"status\",\"!=\",\"Answered\",false],[\"Church Prayer Request\",\"owner\",\"in\",[\"User\",null],false]]", "creation": "2025-09-13 22:28:01.939717", @@ -56,7 +56,7 @@ "list_title": "Your Prayer Requests", "login_required": 1, "max_attachment_size": 0, - "modified": "2025-09-21 22:49:35.504853", + "modified": "2025-09-29 23:16:33.333821", "modified_by": "Administrator", "module": "Church Prayers", "name": "prayer-request", diff --git a/church/fixtures/church_prayer_request_status.json b/church/fixtures/church_prayer_request_status.json index 930c45b..8cdf0eb 100644 --- a/church/fixtures/church_prayer_request_status.json +++ b/church/fixtures/church_prayer_request_status.json @@ -7,14 +7,6 @@ "name": "Requested", "status": "Requested" }, - { - "description": "The prayer request has been answered", - "docstatus": 0, - "doctype": "Church Prayer Request Status", - "modified": "2025-09-13 00:49:57.973400", - "name": "Answered", - "status": "Answered" - }, { "description": "The prayer request is being prayed for", "docstatus": 0, @@ -22,5 +14,13 @@ "modified": "2025-09-13 00:51:54.820822", "name": "Intercession", "status": "Intercession" + }, + { + "description": "The prayer request has been answered", + "docstatus": 0, + "doctype": "Church Prayer Request Status", + "modified": "2025-09-13 00:49:57.973400", + "name": "Answered", + "status": "Answered" } ] \ No newline at end of file