From c871685db7c5e3f28d56c180fd0811b678fa1d4b Mon Sep 17 00:00:00 2001
From: Asmita Hase <asmitahase@gmail.com>
Date: Wed, 12 Feb 2025 01:58:26 +0530
Subject: [PATCH 1/3] refactor: Use web view for job opening

(cherry picked from commit bc498851a7ffc9e6696df8e75098a5edea330c24)

# Conflicts:
#	hrms/hr/doctype/job_opening/job_opening.json
#	hrms/hr/doctype/job_opening/templates/job_opening_row.html
---
 hrms/hr/doctype/job_opening/job_opening.json          | 11 +++++++----
 .../hr/doctype/job_opening/templates/job_opening.html |  7 +++++++
 .../job_opening/templates/job_opening_row.html        |  7 +++++++
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 hrms/hr/doctype/job_opening/templates/job_opening.html

diff --git a/hrms/hr/doctype/job_opening/job_opening.json b/hrms/hr/doctype/job_opening/job_opening.json
index 72d42deefa..7d580f0150 100644
--- a/hrms/hr/doctype/job_opening/job_opening.json
+++ b/hrms/hr/doctype/job_opening/job_opening.json
@@ -1,5 +1,6 @@
 {
  "actions": [],
+ "allow_guest_to_view": 1,
  "allow_import": 1,
  "autoname": "field:route",
  "creation": "2013-01-15 16:13:36",
@@ -183,10 +184,16 @@
    "read_only": 1
   }
  ],
+ "has_web_view": 1,
  "icon": "fa fa-bookmark",
  "idx": 1,
+ "is_published_field": "publish",
  "links": [],
+<<<<<<< HEAD
  "modified": "2023-09-14 16:50:39.316079",
+=======
+ "modified": "2025-02-11 22:41:14.873299",
+>>>>>>> bc498851 (refactor: Use web view for job opening)
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Job Opening",
@@ -203,10 +210,6 @@
    "role": "HR User",
    "share": 1,
    "write": 1
-  },
-  {
-   "read": 1,
-   "role": "Guest"
   }
  ],
  "sort_field": "modified",
diff --git a/hrms/hr/doctype/job_opening/templates/job_opening.html b/hrms/hr/doctype/job_opening/templates/job_opening.html
new file mode 100644
index 0000000000..63803cecaf
--- /dev/null
+++ b/hrms/hr/doctype/job_opening/templates/job_opening.html
@@ -0,0 +1,7 @@
+{% extends "templates/web.html" %}
+
+{% block page_content %}
+<h1>{{ title |e }}</h1>
+{% endblock %}
+
+<!-- this is a sample default web page template -->
\ No newline at end of file
diff --git a/hrms/hr/doctype/job_opening/templates/job_opening_row.html b/hrms/hr/doctype/job_opening/templates/job_opening_row.html
index cc8523ed0a..e5ded14eb1 100644
--- a/hrms/hr/doctype/job_opening/templates/job_opening_row.html
+++ b/hrms/hr/doctype/job_opening/templates/job_opening_row.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <div class="my-5">
 	<h3>{{ doc.job_title }}</h3>
 	<p>{{ doc.description }}</p>
@@ -16,3 +17,9 @@ <h3>{{ doc.job_title }}</h3>
 		{% endif %}
 	</div>
 </div>
+=======
+<div>
+	<a href="/{{ doc.route |e }}">{{ (doc.title or doc.name) |e }}</a>
+</div>
+<!-- this is a sample default list template -->
+>>>>>>> bc498851 (refactor: Use web view for job opening)

From f2f5dd44183c8274a6572c43c41e05400cfed402 Mon Sep 17 00:00:00 2001
From: Asmita Hase <44727809+asmitahase@users.noreply.github.com>
Date: Wed, 12 Feb 2025 02:45:22 +0530
Subject: [PATCH 2/3] chore: resolved conflict

---
 hrms/hr/doctype/job_opening/job_opening.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/hrms/hr/doctype/job_opening/job_opening.json b/hrms/hr/doctype/job_opening/job_opening.json
index 7d580f0150..0c7eb23bf8 100644
--- a/hrms/hr/doctype/job_opening/job_opening.json
+++ b/hrms/hr/doctype/job_opening/job_opening.json
@@ -189,11 +189,7 @@
  "idx": 1,
  "is_published_field": "publish",
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-09-14 16:50:39.316079",
-=======
  "modified": "2025-02-11 22:41:14.873299",
->>>>>>> bc498851 (refactor: Use web view for job opening)
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Job Opening",
@@ -215,4 +211,4 @@
  "sort_field": "modified",
  "sort_order": "ASC",
  "states": []
-}
\ No newline at end of file
+}

From 62596921d60058b8e3ff82e76361116fc8239295 Mon Sep 17 00:00:00 2001
From: Asmita Hase <44727809+asmitahase@users.noreply.github.com>
Date: Wed, 12 Feb 2025 02:47:04 +0530
Subject: [PATCH 3/3] chore: resolved another conflict

---
 .../templates/job_opening_row.html            | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/hrms/hr/doctype/job_opening/templates/job_opening_row.html b/hrms/hr/doctype/job_opening/templates/job_opening_row.html
index e5ded14eb1..88db3f7c0f 100644
--- a/hrms/hr/doctype/job_opening/templates/job_opening_row.html
+++ b/hrms/hr/doctype/job_opening/templates/job_opening_row.html
@@ -1,25 +1,4 @@
-<<<<<<< HEAD
-<div class="my-5">
-	<h3>{{ doc.job_title }}</h3>
-	<p>{{ doc.description }}</p>
-	{%- if doc.publish_salary_range -%}
-	<p><b>{{_("Salary range per month")}}: </b>{{ frappe.format_value(frappe.utils.flt(doc.lower_range), currency=doc.currency) }} - {{ frappe.format_value(frappe.utils.flt(doc.upper_range), currency=doc.currency) }}</p>
-	{% endif %}
-	<div>
-		{%- if doc.job_application_route -%}
-		<a class='btn btn-primary'
-		href='/{{doc.job_application_route}}/new?job_title={{ doc.name }}'>
-		{{ _("Apply Now") }}</a>
-		{% else %}
-		<a class='btn btn-primary'
-		href='/job_application/new?job_title={{ doc.name }}'>
-		{{ _("Apply Now") }}</a>
-		{% endif %}
-	</div>
-</div>
-=======
 <div>
 	<a href="/{{ doc.route |e }}">{{ (doc.title or doc.name) |e }}</a>
 </div>
 <!-- this is a sample default list template -->
->>>>>>> bc498851 (refactor: Use web view for job opening)