Merge branch 'hot-fix-user'

This commit is contained in:
Rushabh Mehta 2016-03-23 14:00:42 +05:30
commit 025b11cfb7
4 changed files with 4 additions and 4 deletions

View file

@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = "6.27.4"
__version__ = "6.27.5"

View file

@ -20,7 +20,7 @@ frappe.ui.form.on('User', {
},
onload: function(frm) {
if(has_common(user_roles, ["Administrator", "System Manager"])) {
if(has_common(user_roles, ["Administrator", "System Manager"]) && !frm.doc.__islocal) {
if(!frm.roles_editor) {
var role_area = $('<div style="min-height: 300px">')
.appendTo(frm.fields_dict.roles_html.wrapper);

View file

@ -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.4"
app_version = "6.27.5"
app_color = "orange"
source_link = "https://github.com/frappe/frappe"
app_license = "MIT"

View file

@ -1,7 +1,7 @@
from setuptools import setup, find_packages
from pip.req import parse_requirements
version = "6.27.4"
version = "6.27.5"
requirements = parse_requirements("requirements.txt", session="")
setup(