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

Merge branch 'develop'

Browse source
This commit is contained in:
Rushabh Mehta 2016-08-13 10:14:05 +05:30
commit 8c5fb222cc
2 changed files with 3 additions and 3 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.21"
__version__ = "7.0.22"
local = Local()

4
frappe/public/js/frappe/views/breadcrumbs.js
View file

@ -57,12 +57,12 @@ frappe.breadcrumbs = {
.appendTo($breadcrumbs);
}
}
}
console.log(frappe.get_doc('DocType', breadcrumbs.doctype, 'issingle'))
if(breadcrumbs.doctype && frappe.get_route()[0]==="Form") {
if(breadcrumbs.doctype==="User"
&& frappe.user.is_module("Setup")===-1
|| frappe.get_doc('DocType', breadcrumbs.doctype, 'issingle')) {
|| frappe.get_doc('DocType', breadcrumbs.doctype).issingle) {
// no user listview for non-system managers and single doctypes
} else {
if(frappe.boot.treeviews.indexOf(breadcrumbs.doctype) !== -1) {