Browse Source

Merge branch 'hotfix'

version-14
mbauskar 8 years ago
parent
commit
d8ed23e854
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -1
      frappe/core/doctype/user/user.py

+ 1
- 1
frappe/__init__.py View File

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template from .utils.jinja import get_jenv, get_template, render_template


__version__ = '8.0.70'
__version__ = '8.0.71'
__title__ = "Frappe Framework" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 1
- 1
frappe/core/doctype/user/user.py View File

@@ -542,7 +542,7 @@ def test_password_strength(new_password, key=None, old_password=None, user_data=
from frappe.utils.password_strength import test_password_strength as _test_password_strength from frappe.utils.password_strength import test_password_strength as _test_password_strength


password_policy = frappe.db.get_value("System Settings", None, password_policy = frappe.db.get_value("System Settings", None,
["enable_password_policy", "minimum_password_score"], as_dict=True)
["enable_password_policy", "minimum_password_score"], as_dict=True) or {}


enable_password_policy = cint(password_policy.get("enable_password_policy", 0)) enable_password_policy = cint(password_policy.get("enable_password_policy", 0))
minimum_password_score = cint(password_policy.get("minimum_password_score", 0)) minimum_password_score = cint(password_policy.get("minimum_password_score", 0))


Loading…
Cancel
Save