vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'hotfix'

Browse source
This commit is contained in:
Nabin Hait 2016-09-28 10:48:33 +05:30
commit a218f5d299
5 changed files with 57 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -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()

3
frappe/public/css/sidebar.css
View file

@ -305,3 +305,6 @@ a.close:focus {
.layout-side-section .module-sidebar-nav {
margin-top: 15px;
}
.assignment-row {
margin-bottom: 5px;
}

88
frappe/public/js/frappe/views/treeview.js
View file

@ -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;
},
{
label:__("Add Child"),
condition: function(node) { return me.can_create && node.expandable; },
click: function(node) {
me.new_node();
},
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);
});
},
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();
});
},
btnClass: "hidden-xs"
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();
},
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);
});
},
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();
});
},
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() {

8
frappe/public/less/sidebar.less
View file

@ -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;
}

2
frappe/utils/scheduler.py
View file

@ -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: