diff --git a/frappe/__version__.py b/frappe/__version__.py index 679f789661..c28b13d2d8 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.27.3" +__version__ = "6.27.4" diff --git a/frappe/change_log/v6/v6_27_1.md b/frappe/change_log/v6/v6_27_1.md index 780c0abd6c..7156344499 100644 --- a/frappe/change_log/v6/v6_27_1.md +++ b/frappe/change_log/v6/v6_27_1.md @@ -1,3 +1,6 @@ - Configurable Desktop - Add any Documents, Reports, Modules, Pages to the desktop - - Remove all the unwanted icons \ No newline at end of file + - Remove all the unwanted icons +- **Module Page New Design** + - New module design now shows all documents in a module together + - [Read the Details](https://frappe.io/blog/erpnext-features/configurable-desktop) \ No newline at end of file diff --git a/frappe/desk/doctype/desktop_icon/desktop_icon.py b/frappe/desk/doctype/desktop_icon/desktop_icon.py index 35a2a4e703..9b23a76067 100644 --- a/frappe/desk/doctype/desktop_icon/desktop_icon.py +++ b/frappe/desk/doctype/desktop_icon/desktop_icon.py @@ -87,7 +87,7 @@ def get_desktop_icons(user=None): @frappe.whitelist() def add_user_icon(label, link, type, _doctype): '''Add a new user desktop icon to the desktop''' - icon_name = frappe.db.exists('Desktop Icon', {'standard': 0, 'link': link}) + icon_name = frappe.db.exists('Desktop Icon', {'standard': 0, 'link': link, 'owner': frappe.session.user}) if icon_name and frappe.db.get_value('Desktop Icon', icon_name, 'hidden'): frappe.db.set_value('Desktop Icon', icon_name, 'hidden', 0) clear_desktop_icons_cache() diff --git a/frappe/hooks.py b/frappe/hooks.py index b1fd79e47a..33ed55cbba 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies" app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node" app_icon = "octicon octicon-circuit-board" -app_version = "6.27.3" +app_version = "6.27.4" app_color = "orange" source_link = "https://github.com/frappe/frappe" app_license = "MIT" diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index e9c6d3d65f..2fb4d62e3f 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -440,7 +440,6 @@ textarea.form-control { } .open-notification { position: relative; - top: -2px; left: 2px; display: inline-block; background: #ff5858; diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index c344e2130d..ea5ce46a16 100644 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -1302,11 +1302,13 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({ if(this.df.get_options) { return this.df.get_options(); } - if (this.docname==null && cur_dialog!=null){ //for dialog box + if (this.docname==null && cur_dialog) { + //for dialog box return cur_dialog.get_value(this.df.options) } - if (cur_frm==null){//for list page - return $("input[data-fieldname*="+this.df.options+"]").val() + if (cur_frm==null && cur_list){ + //for list page + return cur_list.wrapper.find("input[data-fieldname*="+this.df.options+"]").val() } var options = frappe.model.get_value(this.df.parent, this.docname, this.df.options); // if(!options) { diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 03b6bcc15d..eb22fd56b4 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -278,7 +278,6 @@ textarea.form-control { .open-notification { position:relative; - top:-2px; left: 2px; display:inline-block; background:#ff5858; diff --git a/setup.py b/setup.py index 62f2b30865..8cc565fe6e 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.27.3" +version = "6.27.4" requirements = parse_requirements("requirements.txt", session="") setup(