diff --git a/frappe/__init__.py b/frappe/__init__.py index 852f8a47e6..c688f962a2 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -15,7 +15,7 @@ from past.builtins import cmp 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() 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/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 diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js index 0e89047a7d..282f83bc4c 100644 --- a/frappe/public/js/frappe/ui/toolbar/toolbar.js +++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js @@ -220,7 +220,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"]: 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 @@ - + - +