Skip to content

Commit faafe1a

Browse files
committed
fix: workaround website_route_rules not working
1 parent 1450be6 commit faafe1a

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

wiki/wiki/doctype/wiki_page/templates/show.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ <h1 class="m-0">{{ title }}</h1>
1313
{{ last_revision.owner }} edited {{ frappe.utils.pretty_date(last_revision.creation) }}
1414
{%- if number_of_revisions > 0 %}
1515
&middot;
16-
<li><a href="/{{ path }}/revisions">{{ number_of_revisions }} Revisions</a>&nbsp;</li>
16+
<li><a href="/revisions?wiki_page={{ path }}">{{ number_of_revisions }} Revisions</a>&nbsp;</li>
1717
{%- endif -%}
1818
{%- endif -%}
19-
<li><a href="/{{ path }}/edit">Edit Page</a>&nbsp;</li>
20-
<li><a href="/{{ path }}/new">New Page</a>&nbsp;</li>
19+
<li><a href="/edit?wiki_page={{ path }}">Edit Page</a>&nbsp;</li>
20+
<li><a href="/new?wiki_page={{ path }}">New Page</a>&nbsp;</li>
2121
</ul>
2222
</div>
2323

wiki/wiki/doctype/wiki_page/wiki_page.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ def update(
305305
if hasattr(patch, 'new_wiki_page'):
306306
out.route = patch.new_wiki_page.route
307307
else:
308-
out.route = patch.wiki_page_doc.route
308+
out.route = patch.wiki_page
309309

310310
return out
311311

wiki/www/contributions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ def get_context(context):
2525
for contribution in contributions:
2626
route = frappe.db.get_value("Wiki Page", contribution.wiki_page, "route")
2727
if contribution.new:
28-
contribution.edit_link = f"/{route}/new?wiki_page_patch={contribution.name}"
28+
contribution.edit_link = f"/new?wiki_page={route}&wiki_page_patch={contribution.name}&new=1"
2929
else:
30-
contribution.edit_link = f"/{route}/edit?wiki_page_patch={contribution.name}"
30+
contribution.edit_link = f"/edit?wiki_page={route}&wiki_page_patch={contribution.name}"
3131
contribution.color = color_map[contribution.status]
3232
contribution.creation = frappe.utils.pretty_date(contribution.creation)
3333
context.contributions.extend([contribution])

0 commit comments

Comments
 (0)