diff --git a/foundation/erpnext_foundation/doctype/bounty/bounty.js b/foundation/erpnext_foundation/doctype/bounty/bounty.js index e8d26cb2..0d90952e 100644 --- a/foundation/erpnext_foundation/doctype/bounty/bounty.js +++ b/foundation/erpnext_foundation/doctype/bounty/bounty.js @@ -7,7 +7,7 @@ frappe.ui.form.on('Bounty', { }, feature_name: function(frm) { if (frm.doc.route) return; - const route = 'bounty/' + frm.doc.feature_name.toLowerCase().replace(/ /g, '-'); + const route = 'bounties/' + frm.doc.feature_name.toLowerCase().replace(/ /g, '-'); frm.set_value('route', route); } }); diff --git a/foundation/erpnext_foundation/doctype/bounty/bounty.json b/foundation/erpnext_foundation/doctype/bounty/bounty.json index 4a12c176..4191a7e7 100644 --- a/foundation/erpnext_foundation/doctype/bounty/bounty.json +++ b/foundation/erpnext_foundation/doctype/bounty/bounty.json @@ -384,8 +384,8 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-08-21 15:20:13.637175", - "modified_by": "Administrator", + "modified": "2017-08-23 17:58:31.810230", + "modified_by": "faris@erpnext.com", "module": "ERPNext Foundation", "name": "Bounty", "name_case": "", @@ -415,7 +415,7 @@ "quick_entry": 0, "read_only": 0, "read_only_onload": 0, - "route": "bounty", + "route": "bounties", "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", diff --git a/foundation/erpnext_foundation/doctype/bounty/bounty.py b/foundation/erpnext_foundation/doctype/bounty/bounty.py index 78766b41..4a9241a5 100644 --- a/foundation/erpnext_foundation/doctype/bounty/bounty.py +++ b/foundation/erpnext_foundation/doctype/bounty/bounty.py @@ -36,7 +36,7 @@ class Bounty(WebsiteGenerator): self.bounty_collected = sum([backer.amount for backer in self.bounty_backer if backer.paid]) if not self.route: self.published = 1 - self.route = 'bounty/' + self.feature_name.lower().replace(' ', '-') + self.route = 'bounties/' + self.feature_name.lower().replace(' ', '-') def get_list_context(context): context.allow_guest = True diff --git a/foundation/erpnext_foundation/doctype/bounty/templates/bounty_row.html b/foundation/erpnext_foundation/doctype/bounty/templates/bounty_row.html index 3426ecd1..f4e82142 100644 --- a/foundation/erpnext_foundation/doctype/bounty/templates/bounty_row.html +++ b/foundation/erpnext_foundation/doctype/bounty/templates/bounty_row.html @@ -11,7 +11,7 @@
{{ fmt_money(doc.goal, currency="USD") }} - {{ doc.end_date }} + Ends on {{ doc.end_date }} {% if doc.bounty_backer %} {{ doc.bounty_backer|len }} diff --git a/foundation/erpnext_foundation/web_form/back_this_bounty/back_this_bounty.json b/foundation/erpnext_foundation/web_form/back_this_bounty/back_this_bounty.json index fee23bbf..cd25f895 100644 --- a/foundation/erpnext_foundation/web_form/back_this_bounty/back_this_bounty.json +++ b/foundation/erpnext_foundation/web_form/back_this_bounty/back_this_bounty.json @@ -19,8 +19,8 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2017-08-21 16:36:33.431742", - "modified_by": "Administrator", + "modified": "2017-08-23 18:05:50.695856", + "modified_by": "faris@erpnext.com", "module": "ERPNext Foundation", "name": "back-this-bounty", "owner": "faris@erpnext.com", @@ -30,7 +30,7 @@ "route": "bounty/back-this-bounty", "show_sidebar": 1, "sidebar_items": [], - "success_url": "/bounty", + "success_url": "/bounties", "title": "Back this bounty", "web_form_fields": [ { diff --git a/foundation/erpnext_foundation/web_form/start_a_new_bounty/start_a_new_bounty.json b/foundation/erpnext_foundation/web_form/start_a_new_bounty/start_a_new_bounty.json index 763972b4..227756fc 100644 --- a/foundation/erpnext_foundation/web_form/start_a_new_bounty/start_a_new_bounty.json +++ b/foundation/erpnext_foundation/web_form/start_a_new_bounty/start_a_new_bounty.json @@ -18,8 +18,8 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2017-08-21 16:36:27.918067", - "modified_by": "Administrator", + "modified": "2017-08-23 18:04:50.092049", + "modified_by": "faris@erpnext.com", "module": "ERPNext Foundation", "name": "start-a-new-bounty", "owner": "Administrator", @@ -28,7 +28,7 @@ "route": "new-bounty", "show_sidebar": 1, "sidebar_items": [], - "success_url": "/bounty", + "success_url": "/bounties", "title": "Start a new Bounty", "web_form_fields": [ { diff --git a/foundation/hooks.py b/foundation/hooks.py index 6dda8aec..6741c2fd 100644 --- a/foundation/hooks.py +++ b/foundation/hooks.py @@ -47,7 +47,7 @@ website_context = { {"label": "Services", "url": "/service-providers", "right": 1}, {"label": "Jobs", "url": "/erpnext-jobs", "right": 1}, {"label": "Chapters", "url": "/chapters", "right": 1}, - {"label": "Bounties", "url": "/bounty", "right": 1}, + {"label": "Bounties", "url": "/bounties", "right": 1}, {"label": 'Conference', "url": "/conf/2017", "right": 1}, {"label": "About", "url": "/about", "right": 1}, ],