From c54724ac277a7fb432aec491d8b7b2d6935356d7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 7 Jul 2015 16:36:49 +0530 Subject: [PATCH 1/4] [minor] label description --- frappe/website/doctype/top_bar_item/top_bar_item.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/top_bar_item/top_bar_item.json b/frappe/website/doctype/top_bar_item/top_bar_item.json index 73bb5ca9ab..7efcdd763b 100644 --- a/frappe/website/doctype/top_bar_item/top_bar_item.json +++ b/frappe/website/doctype/top_bar_item/top_bar_item.json @@ -22,7 +22,7 @@ "permlevel": 0 }, { - "description": "Link to the page you want to open", + "description": "Link to the page you want to open. Leave blank if you want to make it a group parent.", "fieldname": "url", "fieldtype": "Data", "in_list_view": 1, @@ -51,7 +51,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-02-19 13:07:34.558311", + "modified": "2015-07-07 07:06:26.632888", "modified_by": "Administrator", "module": "Website", "name": "Top Bar Item", From 26b219a461ede5e4b6b795bd345a12899b4c33c9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 8 Jul 2015 11:20:22 +0530 Subject: [PATCH 2/4] [fix] autocomplete --- frappe/public/js/frappe/ui/toolbar/awesome_bar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js index 2b9580de35..ff4955f084 100644 --- a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js +++ b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js @@ -34,7 +34,7 @@ frappe.search = { frappe.search.autocomplete_open = false; }, select: function(event, ui) { - if(ui.item._options) { + if(ui.item.route_options) { frappe.route_options = ui.item.route_options; } From f6bee7e78ba1687869ee5e95e4d8d82c01daaabe Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 8 Jul 2015 12:38:28 +0530 Subject: [PATCH 3/4] [minor] [ui] link to calendars --- frappe/boot.py | 1 + frappe/hooks.py | 2 + frappe/public/js/frappe/ui/page.html | 58 ++++++++++++----------- frappe/public/js/frappe/views/calendar.js | 12 ++++- frappe/utils/formatters.py | 1 - 5 files changed, 44 insertions(+), 30 deletions(-) diff --git a/frappe/boot.py b/frappe/boot.py index f1877c35c1..5531d844cd 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -70,6 +70,7 @@ def get_bootinfo(): bootinfo.error_report_email = frappe.get_hooks("error_report_email") bootinfo.default_background_image = get_url("/assets/frappe/images/ui/into-the-dawn.jpg") + bootinfo.calendars = sorted(frappe.get_hooks("calendars")) return bootinfo diff --git a/frappe/hooks.py b/frappe/hooks.py index 4af90fef30..6bc6432700 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -59,6 +59,8 @@ website_generators = ["Web Page", "Blog Post", "Blog Category", "Web Form"] email_append_to = ["Event", "ToDo", "Communication"] +calendars = ["Event"] + # login on_session_creation = [ diff --git a/frappe/public/js/frappe/ui/page.html b/frappe/public/js/frappe/ui/page.html index f5f549fcf1..188d79290c 100644 --- a/frappe/public/js/frappe/ui/page.html +++ b/frappe/public/js/frappe/ui/page.html @@ -2,37 +2,39 @@
- -

-
- -

+ +

+
+ +

- -
- + +
+ - -
- - -
- -
- - -
- + +
+ + +
+ +
+ + +
+
diff --git a/frappe/public/js/frappe/views/calendar.js b/frappe/public/js/frappe/views/calendar.js index 58a2ffaae4..7d19b15fc2 100644 --- a/frappe/public/js/frappe/views/calendar.js +++ b/frappe/public/js/frappe/views/calendar.js @@ -65,7 +65,17 @@ frappe.views.Calendar = frappe.views.CalendarBase.extend({ frappe.set_route("Form", me.doctype, doc.name); }); - var me = this; + // add links to other calendars + $.each(frappe.boot.calendars, function(i, doctype) { + if(frappe.model.can_read(doctype)) { + me.page.add_menu_item(__(doctype), function() { + frappe.set_route("Calendar", doctype); + }); + } + }); + + this.page.page_actions.find(".menu-btn-group-label").text(__("Type")); + $(this.parent).on("show", function() { me.$cal.fullCalendar("refetchEvents"); }) diff --git a/frappe/utils/formatters.py b/frappe/utils/formatters.py index 2d618d743e..1d2b1783cb 100644 --- a/frappe/utils/formatters.py +++ b/frappe/utils/formatters.py @@ -48,4 +48,3 @@ def format_value(value, df, doc=None, currency=None): return value.replace("\n", "
") return value - From 60b95587b27cae78ceeeb294a437f9e1e0679613 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 8 Jul 2015 17:19:12 +0600 Subject: [PATCH 4/4] bumped to version 5.0.34 --- frappe/__version__.py | 2 +- frappe/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index c37c2738ca..e5436f3a26 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "5.0.33" +__version__ = "5.0.34" diff --git a/frappe/hooks.py b/frappe/hooks.py index 6bc6432700..a3a207f39e 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -4,7 +4,7 @@ app_title = "Frappe Framework" app_publisher = "Frappe Technologies Pvt. Ltd." app_description = "Full Stack Web Application Framework in Python" app_icon = "octicon octicon-circuit-board" -app_version = "5.0.33" +app_version = "5.0.34" app_color = "orange" app_email = "support@frappe.io" diff --git a/setup.py b/setup.py index 59036883c9..fe79c0b182 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "5.0.33" +version = "5.0.34" with open("requirements.txt", "r") as f: install_requires = f.readlines()