From 74bc80d9829ca8091d31bdea95ffb6a0c41a424d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 26 Sep 2016 11:15:10 +0530 Subject: [PATCH 1/3] [fix] pass_does_not_exist_error --- frappe/public/css/sidebar.css | 3 +++ frappe/public/less/sidebar.less | 8 ++++++-- frappe/utils/scheduler.py | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/frappe/public/css/sidebar.css b/frappe/public/css/sidebar.css index cbe0b5b2c9..9933137a7e 100644 --- a/frappe/public/css/sidebar.css +++ b/frappe/public/css/sidebar.css @@ -305,3 +305,6 @@ a.close:focus { .layout-side-section .module-sidebar-nav { margin-top: 15px; } +.assignment-row { + margin-bottom: 5px; +} diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less index 85a6491c54..5ef0151d70 100644 --- a/frappe/public/less/sidebar.less +++ b/frappe/public/less/sidebar.less @@ -7,14 +7,14 @@ html { body { height: 100%; - // The html and body elements cannot have any padding or margin. + // The html and body elements cannot have any padding or margin. margin: 0px; padding: 0px !important; } html, body { - overflow-x: hidden; //Prevent scroll on narrow devices + overflow-x: hidden; //Prevent scroll on narrow devices } .hide-form-sidebar { @@ -393,3 +393,7 @@ a.close { .layout-side-section .module-sidebar-nav { margin-top: 15px; } + +.assignment-row { + margin-bottom: 5px; +} diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py index 9ba78c3ab8..347225e74a 100755 --- a/frappe/utils/scheduler.py +++ b/frappe/utils/scheduler.py @@ -31,7 +31,7 @@ def start_scheduler(): '''Run enqueue_events_for_all_sites every 2 minutes (default). Specify scheduler_interval in seconds in common_site_config.json''' - interval = frappe.get_conf().scheduler_interval or 120 + interval = frappe.get_conf().scheduler_interval or 240 schedule.every(interval).seconds.do(enqueue_events_for_all_sites) while True: From 1b71e34ae46df3eb0c05c09d0fe2aa64130f0ac9 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 26 Sep 2016 18:13:37 +0530 Subject: [PATCH 2/3] [fix] toolbar fix (#2102) --- frappe/public/js/frappe/views/treeview.js | 86 ++++++++++++----------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js index 459a293666..5133f6e424 100644 --- a/frappe/public/js/frappe/views/treeview.js +++ b/frappe/public/js/frappe/views/treeview.js @@ -111,50 +111,54 @@ frappe.views.TreeView = Class.extend({ }, get_toolbar: function(){ var me = this; - if(this.opts.toolbar) { - return this.opts.toolbar; - } else { - return [ - {toggle_btn: true}, - { - label:__("Edit"), - condition: function(node) { - return !node.root && me.can_read; - }, - click: function(node) { - frappe.set_route("Form", me.doctype, node.label); - } + + var toolbar = [ + {toggle_btn: true}, + { + label:__("Edit"), + condition: function(node) { + return !node.root && me.can_read; + }, + click: function(node) { + frappe.set_route("Form", me.doctype, node.label); + } + }, + { + label:__("Add Child"), + condition: function(node) { return me.can_create && node.expandable; }, + click: function(node) { + me.new_node(); }, - { - label:__("Add Child"), - condition: function(node) { return me.can_create && node.expandable; }, - click: function(node) { - me.new_node(); - }, - btnClass: "hidden-xs" + btnClass: "hidden-xs" + }, + { + label:__("Rename"), + condition: function(node) { return !node.root && me.can_write; }, + click: function(node) { + frappe.model.rename_doc(me.doctype, node.label, function(new_name) { + node.$a.html(new_name); + }); }, - { - label:__("Rename"), - condition: function(node) { return !node.root && me.can_write; }, - click: function(node) { - frappe.model.rename_doc(me.doctype, node.label, function(new_name) { - node.$a.html(new_name); - }); - }, - btnClass: "hidden-xs" + btnClass: "hidden-xs" + }, + { + label:__("Delete"), + condition: function(node) { return !node.root && me.can_delete; }, + click: function(node) { + frappe.model.delete_doc(me.doctype, node.label, function() { + node.parent.remove(); + }); }, - { - label:__("Delete"), - condition: function(node) { return !node.root && me.can_delete; }, - click: function(node) { - frappe.model.delete_doc(me.doctype, node.label, function() { - node.parent.remove(); - }); - }, - btnClass: "hidden-xs" - } - - ] + btnClass: "hidden-xs" + } + ] + + if(this.opts.toolbar && this.opts.extend_toolbar) { + return toolbar.concat(this.opts.toolbar) + } else if (this.opts.toolbar && !this.opts.extend_toolbar) { + return this.opts.toolbar + } else { + return toolbar } }, new_node: function() { From ca70d0def0565a65aab3e702fe349b148f4e887e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 28 Sep 2016 11:18:33 +0600 Subject: [PATCH 3/3] bumped to version 7.0.36 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index c4c7da21c8..f317cecefd 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = "7.0.35" +__version__ = "7.0.36" local = Local()