From 23fefbb6440094b72fd4d45a5f3cc15d69d8ee8f Mon Sep 17 00:00:00 2001 From: Saurabh Date: Sat, 10 Mar 2018 04:08:22 +0530 Subject: [PATCH 1/4] List-view title bug fix --- frappe/public/js/frappe/list/list_item_subject.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/list/list_item_subject.html b/frappe/public/js/frappe/list/list_item_subject.html index 380b71456e..6b5f4fd11c 100644 --- a/frappe/public/js/frappe/list/list_item_subject.html +++ b/frappe/public/js/frappe/list/list_item_subject.html @@ -13,12 +13,14 @@ {{ (_liked_by.length > 99 ? "99+" : _liked_by.length) || "" }} {% } %} + +{% var anchor_title = (_full_title).replace(/["]/g, "&\quot;"); %} {{ strip_html(_title) }} + title="{{ anchor_title }}">{{ strip_html(_title) }} {% if (_workflow && !_without_workflow) { %} {%= _workflow.value %} -{% } %} +{% } %} \ No newline at end of file From 385237b98a63d05b51a59a2cfd7c28c9cd4a9999 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 13 Mar 2018 14:45:17 +0530 Subject: [PATCH 2/4] [fix] missing toolbar in frappe when setup_wizard has not been officially completed (#5188) --- frappe/public/js/frappe/desk.js | 4 ++-- frappe/public/js/frappe/ui/toolbar/toolbar.js | 6 +++--- frappe/sessions.py | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 63d39712d6..5490606953 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -237,7 +237,7 @@ frappe.Application = Class.extend({ refresh_notifications: function() { var me = this; - if(frappe.session_alive && frappe.boot && !frappe.boot.in_setup_wizard) { + if(frappe.session_alive && frappe.boot && !(frappe.boot.home_page !== 'setup-wizard')) { return frappe.call({ method: "frappe.desk.notifications.get_notifications", callback: function(r) { @@ -359,7 +359,7 @@ frappe.Application = Class.extend({ }, make_nav_bar: function() { // toolbar - if(frappe.boot && !frappe.boot.in_setup_wizard) { + if(frappe.boot && frappe.boot.home_page!=='setup-wizard') { frappe.frappe_toolbar = new frappe.ui.toolbar.Toolbar(); } diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js index b50d67a290..efa0b3d95a 100644 --- a/frappe/public/js/frappe/ui/toolbar/toolbar.js +++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js @@ -39,7 +39,7 @@ frappe.ui.toolbar.Toolbar = Class.extend({ $('.navbar-set-desktop-icons').on('click', () => { this.modules_select.show(); }); - }, + }, setup_frappe_chat ( ) { frappe.log = frappe.Logger.get('frappe.chat'); @@ -47,7 +47,7 @@ frappe.ui.toolbar.Toolbar = Class.extend({ frappe.log.info('Setting up frappe.chat'); frappe.log.warn('TODO: Handle realtime System Settings update.'); frappe.log.warn('TODO: frappe.chat. requires a storage.'); - + // Create/Get Chat Profile for session User, retrieve enable_chat frappe.log.info('Creating a Chat Profile.'); frappe.chat.profile.create('enable_chat').then(({ enable_chat }) => { @@ -283,7 +283,7 @@ frappe.ui.toolbar.Toolbar = Class.extend({ me.progress_dialog.show(); }); - if (frappe.boot.is_first_startup) { + if (cint(frappe.boot.sysdefault.is_first_startup)) { me.progress_dialog.show(); frappe.call({ method: "frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup", diff --git a/frappe/sessions.py b/frappe/sessions.py index b99d7db58a..5b10d5a819 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -169,8 +169,6 @@ def get(): # check only when clear cache is done, and don't cache this if frappe.local.request: bootinfo["change_log"] = get_change_log() - bootinfo["in_setup_wizard"] = not cint(frappe.db.get_single_value('System Settings', 'setup_complete')) - bootinfo["is_first_startup"] = cint(frappe.db.get_single_value('System Settings', 'is_first_startup')) bootinfo["metadata_version"] = frappe.cache().get_value("metadata_version") if not bootinfo["metadata_version"]: From 34c869e6b8548d851bb755bf16acbb980c01d848 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 13 Mar 2018 14:46:00 +0530 Subject: [PATCH 3/4] Fix Slideshow controls (#5187) --- frappe/templates/includes/slideshow.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/templates/includes/slideshow.html b/frappe/templates/includes/slideshow.html index 429d5b10e4..222cbdc651 100644 --- a/frappe/templates/includes/slideshow.html +++ b/frappe/templates/includes/slideshow.html @@ -28,10 +28,10 @@ - + - + From 99ac259c9a48a28db6ff79134e1426de52c4b62c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 13 Mar 2018 16:42:07 +0600 Subject: [PATCH 4/4] bumped to version 10.1.5 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 2314eeda22..dfbef90a17 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '10.1.4' +__version__ = '10.1.5' __title__ = "Frappe Framework" local = Local()