diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index 2611190d381cc434e7e249bbca853ca6f1a10785..336c1ae53591fa660836890382e744c39ec7ab13 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -398,7 +398,6 @@ def get_project_list(doctype, txt, filters, limit_start, limit_page_length=20, o from frappe.www.list import get_list customers, suppliers = get_customers_suppliers("Project", frappe.session.user) - ignore_permissions = False if is_website_user() and frappe.session.user != "Guest": if not filters: diff --git a/erpnext/templates/includes/issue_row.html b/erpnext/templates/includes/issue_row.html index 47c626b22d227cb8430cb7bfde23b2012e3ebb71..dbbd6a019723d817dca37e1543386119b628b580 100644 --- a/erpnext/templates/includes/issue_row.html +++ b/erpnext/templates/includes/issue_row.html @@ -1,26 +1,30 @@ - -
- {% set indicator = 'red' if doc.status == 'Open' else 'darkgrey' %} - {% set indicator = 'green' if doc.status == 'Closed' else indicator %} - - {{ doc.name }} -
-
- {{ doc.subject }}
-
- {% set indicator = 'red' if doc.status == 'Open' else 'darkgrey' %} - {% set indicator = 'green' if doc.status == 'Closed' else indicator %} - {% set indicator = 'orange' if doc.status == 'Open' and doc.priority == 'Medium' else indicator %} - {% set indicator = 'yellow' if doc.status == 'Open' and doc.priority == 'Low' else indicator %} - - {% if doc.status == "Open" %} - {{ doc.priority }} - {% else %} - {{ doc.status }} - {%- endif -%} - -
-
- {{ frappe.format_date(doc.modified) }} -
- +
+ +
+
+ {% set indicator = 'red' if doc.status == 'Open' else 'gray' %} + {% set indicator = 'green' if doc.status == 'Closed' else indicator %} + + {{ doc.name }} +
+
+ {{ doc.subject }}
+
+ {% set indicator = 'red' if doc.status == 'Open' else 'gray' %} + {% set indicator = 'green' if doc.status == 'Closed' else indicator %} + {% set indicator = 'orange' if doc.status == 'Open' and doc.priority == 'Medium' else indicator %} + {% set indicator = 'yellow' if doc.status == 'Open' and doc.priority == 'Low' else indicator %} + + {% if doc.status == "Open" %} + {{ _(doc.priority) or _(doc.status) }} + {% else %} + {{ _(doc.status) }} + {%- endif -%} + +
+
+ {{ frappe.format_date(doc.modified) }} +
+
+ +
diff --git a/erpnext/templates/pages/help.html b/erpnext/templates/pages/help.html index 1cfe358efd6758f7b29d69465b1fde47438896c2..cc1b02b9f6c8553310a587ad5e3158eed0ff9224 100644 --- a/erpnext/templates/pages/help.html +++ b/erpnext/templates/pages/help.html @@ -2,8 +2,10 @@ {% block title %} {{ _("Help") }} {% endblock %} -{% block header %}

{{ _("Help") }}

+{% block header %}

{{ _("Help") }}

{% endblock %} +{% block content %} +
0 -%}
-

{{ _("Your tickets") }}

+

{{ _("Your issues") }}

{% for doc in issues %} {% include "templates/includes/issue_row.html" %} {% endfor %} @@ -60,5 +62,6 @@ {{ _("Open a new ticket") }} {%- endif %} +
{% endblock %} diff --git a/erpnext/templates/pages/help.py b/erpnext/templates/pages/help.py index 19993ee9b1358fc267cc00276acdd7be13e8b6e6..b021502fb57cb4568089fbb9830a8002ec4dddd6 100644 --- a/erpnext/templates/pages/help.py +++ b/erpnext/templates/pages/help.py @@ -10,7 +10,7 @@ def get_context(context): s = settings # Get Started sections - sections = json.loads(s.get_started_sections) + sections = json.loads(s.get_started_sections or "[]") context.get_started_sections = sections # Forum posts @@ -27,6 +27,9 @@ def get_context(context): def get_forum_posts(s): + if not s.forum_url: + return [], {} + response = requests.get(s.forum_url + "/" + s.get_latest_query) response.raise_for_status() response_json = response.json() diff --git a/erpnext/templates/pages/projects.py b/erpnext/templates/pages/projects.py index 6a1ee4edde8c15f5e323aaf4984973bf16efb576..e9296e7cb87b0cd25b1d246f208eecf4d709ec25 100644 --- a/erpnext/templates/pages/projects.py +++ b/erpnext/templates/pages/projects.py @@ -15,6 +15,7 @@ def get_context(context): ["user", "view_attachments"], as_dict=True, ) + if frappe.session.user != "Administrator" and (not project_user or frappe.session.user == "Guest"): raise frappe.PermissionError diff --git a/erpnext/templates/pages/search_help.py b/erpnext/templates/pages/search_help.py index 801273d7f0222233e6d42df4ee788b6468db240c..350a37287ef56cea80b0b2cc6d85d6280574491e 100644 --- a/erpnext/templates/pages/search_help.py +++ b/erpnext/templates/pages/search_help.py @@ -4,13 +4,13 @@ from frappe import _ from frappe.core.utils import html2text from frappe.utils import sanitize_html from frappe.utils.global_search import search -from jinja2 import utils +from markupsafe import escape def get_context(context): context.no_cache = 1 if frappe.form_dict.q: - query = str(utils.escape(sanitize_html(frappe.form_dict.q))) + query = str(escape(sanitize_html(frappe.form_dict.q))) context.title = _("Help Results for") context.query = query @@ -47,9 +47,7 @@ def get_help_results_sections(text): def get_response(api, text): - response = requests.get( - api.base_url + "/" + api.query_route, data={api.search_term_param_name: text} - ) + response = requests.get(api.base_url + "/" + api.query_route, data={api.search_term_param_name: text}) response.raise_for_status() return response.json() diff --git a/erpnext/templates/pages/timelog_info.html b/erpnext/templates/pages/timelog_info.html index f6054e76bbe7138fa0988b3096f22fb97e9dc2da..b088d50f9e2b91e4c88baf1e1b076de841c242cb 100644 --- a/erpnext/templates/pages/timelog_info.html +++ b/erpnext/templates/pages/timelog_info.html @@ -38,7 +38,7 @@ - +