From 03264d5d6a6a9271445d98173420dc47d1ccd7d9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 3 May 2018 10:45:18 +0530 Subject: [PATCH 1/5] minor fix --- frappe/desk/query_report.py | 1 + frappe/public/css/desk.css | 3 +++ 2 files changed, 4 insertions(+) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 4d66a18593..7ab00f96c3 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -293,6 +293,7 @@ def has_match(row, linked_doctypes, doctype_match_filters, ref_doctype, if_owner if dt=="User" and columns_dict[idx]==columns_dict.get("owner"): continue + cell_value = None if isinstance(row, dict): cell_value = row.get(idx) elif isinstance(row, list): diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index 82d539761d..f347aca998 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -555,6 +555,9 @@ li.user-progress .progress-bar { li.user-progress .progress-chart { width: 25px; } + li.user-progress { + display: none; + } } .msg-box { padding: 30px 15px; From 1cef6890e31f3befa88df60f9c6deba1f778291e Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 3 May 2018 16:12:16 +0530 Subject: [PATCH 2/5] Show footer in Full Page printview --- frappe/www/printview.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/frappe/www/printview.html b/frappe/www/printview.html index ecefab57ad..2953ff2c90 100644 --- a/frappe/www/printview.html +++ b/frappe/www/printview.html @@ -22,6 +22,20 @@ {{ body }} + {%- if comment -%} From 8b2e4a5f4cb2d94d7152b1f3b6dedf3fad338f2e Mon Sep 17 00:00:00 2001 From: ci2014 Date: Fri, 4 May 2018 09:45:30 +0200 Subject: [PATCH 3/5] Check for list_renderer before accessing settings (#5469) * Check for list_renderer before accessing settings In the master version of frappe, in the first attempt of calling the file manager (when onload is called) the report doesn't build, because in the report view, there is no such attribute list_renderer available. In that change we check if the list renderer is not undefined and only setup the menu, drag and drop and copy function, when the list_renderer object is available. This problem might not occur in the developer versions (datatables), but many people still work with the master version and need a working file manager report. * Update file_list.js --- frappe/core/doctype/file/file_list.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/frappe/core/doctype/file/file_list.js b/frappe/core/doctype/file/file_list.js index 61b4a58a0c..ea117fddeb 100644 --- a/frappe/core/doctype/file/file_list.js +++ b/frappe/core/doctype/file/file_list.js @@ -38,12 +38,15 @@ frappe.listview_settings['File'] = { doclist.breadcrumb = $('
    ') .insertBefore(doclist.filter_area); - doclist.list_renderer.settings.setup_menu(doclist); - doclist.list_renderer.settings.setup_dragdrop(doclist); + + if (doclist.list_renderer) { + doclist.list_renderer.settings.setup_menu(doclist); + doclist.list_renderer.settings.setup_dragdrop(doclist); - doclist.$page.on("click", ".list-row-checkbox", function(event) { - doclist.list_renderer.settings.add_menu_item_copy(doclist); - }); + doclist.$page.on("click", ".list-row-checkbox", function(event) { + doclist.list_renderer.settings.add_menu_item_copy(doclist); + }); + } }, list_view_doc:function(doclist){ $(doclist.wrapper).on("click", 'button[list_view_doc="'+doclist.doctype+'"]', function() { From 5cc28b12576f98a3bfcb88afe7261b120a3b7b68 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Fri, 4 May 2018 19:05:48 +0530 Subject: [PATCH 4/5] pip fix (#5527) --- frappe/utils/boilerplate.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py index 155f772e44..6a1239bb7c 100755 --- a/frappe/utils/boilerplate.py +++ b/frappe/utils/boilerplate.py @@ -267,12 +267,11 @@ def get_data(): setup_template = """# -*- coding: utf-8 -*- from setuptools import setup, find_packages -try: # for pip >= 10 - from pip._internal.req import parse_requirements -except ImportError: # for pip <= 9.0.3 - from pip.req import parse_requirements import re, ast +with open('requirements.txt') as f: + install_requires = f.read().strip().split('\n') + # get version from __version__ variable in {app_name}/__init__.py _version_re = re.compile(r'__version__\s+=\s+(.*)') @@ -280,8 +279,6 @@ with open('{app_name}/__init__.py', 'rb') as f: version = str(ast.literal_eval(_version_re.search( f.read().decode('utf-8')).group(1))) -requirements = parse_requirements("requirements.txt", session="") - setup( name='{app_name}', version=version, @@ -291,8 +288,7 @@ setup( packages=find_packages(), zip_safe=False, include_package_data=True, - install_requires=[str(ir.req) for ir in requirements], - dependency_links=[str(ir._link) for ir in requirements if ir._link] + install_requires=install_requires ) """ From 00adb31d6944a3618f08d510f99c28de873ae8cd Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Sat, 5 May 2018 12:38:47 +0600 Subject: [PATCH 5/5] bumped to version 10.1.29 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 95a7386a17..d593bb8acb 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.28' +__version__ = '10.1.29' __title__ = "Frappe Framework" local = Local()