Merge branch 'hotfix'

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.1.33'
+__version__ = '10.1.34'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/file/file.json

@@ -239,7 +239,7 @@
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "File Size", 
-   "length": 0, 
+   "length": 20, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -683,7 +683,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-01-15 03:41:23.876072", 
+ "modified": "2018-05-24 05:22:50.819899", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "File", 

frappe/model/db_schema.py

@@ -24,31 +24,32 @@ varchar_len = '140'
 standard_varchar_columns = ('name', 'owner', 'modified_by', 'parent', 'parentfield', 'parenttype')
 
 type_map = {
-	'Currency':		('decimal', '18,6')
-	,'Int':			('int', '11')
-	,'Float':		('decimal', '18,6')
-	,'Percent':		('decimal', '18,6')
-	,'Check':		('int', '1')
-	,'Small Text':		('text', '')
-	,'Long Text':		('longtext', '')
-	,'Code':		('longtext', '')
-	,'Text Editor':		('longtext', '')
-	,'Date':		('date', '')
-	,'Datetime':		('datetime', '6')
-	,'Time':		('time', '6')
-	,'Text':		('text', '')
-	,'Data':		('varchar', varchar_len)
-	,'Link':		('varchar', varchar_len)
-	,'Dynamic Link':	('varchar', varchar_len)
-	,'Password':		('varchar', varchar_len)
-	,'Select':		('varchar', varchar_len)
-	,'Read Only':		('varchar', varchar_len)
-	,'Attach':		('text', '')
-	,'Attach Image':	('text', '')
-	,'Signature':		('longtext', '')
-	,'Color':		('varchar', varchar_len)
-	,'Barcode':		('longtext', '')
-	,'Geolocation':		('longtext', '')
+	'Currency':		('decimal', '18,6'),
+	'Int':			('int', '11'),
+	'Long Int':		('bigint', '20'), # convert int to bigint if length is more than 11
+	'Float':		('decimal', '18,6'),
+	'Percent':		('decimal', '18,6'),
+	'Check':		('int', '1'),
+	'Small Text':		('text', ''),
+	'Long Text':		('longtext', ''),
+	'Code':			('longtext', ''),
+	'Text Editor':		('longtext', ''),
+	'Date':			('date', ''),
+	'Datetime':		('datetime', '6'),
+	'Time':			('time', '6'),
+	'Text':			('text', ''),
+	'Data':			('varchar', varchar_len),
+	'Link':			('varchar', varchar_len),
+	'Dynamic Link':		('varchar', varchar_len),
+	'Password':		('varchar', varchar_len),
+	'Select':		('varchar', varchar_len),
+	'Read Only':		('varchar', varchar_len),
+	'Attach':		('text', ''),
+	'Attach Image':		('text', ''),
+	'Signature':		('longtext', ''),
+	'Color':		('varchar', varchar_len),
+	'Barcode':		('longtext', ''),
+	'Geolocation':		('longtext', '')
 }
 
 default_columns = ['name', 'creation', 'modified', 'modified_by', 'owner',
@@ -198,7 +199,7 @@ class DbTable:
 			if k not in column_list:
 				d = self.columns[k].get_definition()
 				if d:
-					ret.append('`'+ k+ '` ' + d)
+					ret.append('`'+ k + '` ' + d)
 					column_list.append(k)
 		return ret
 
@@ -598,6 +599,10 @@ def remove_all_foreign_keys():
 def get_definition(fieldtype, precision=None, length=None):
 	d = type_map.get(fieldtype)
 
+	# convert int to long int if the length of the int is greater than 11
+	if fieldtype == "Int" and length>11:
+		d = type_map.get("Long Int")
+
 	if not d:
 		return
 

frappe/public/js/frappe/model/model.js

@@ -15,7 +15,7 @@ $.extend(frappe.model, {
 
 	std_fields: [
 		{fieldname:'name', fieldtype:'Link', label:__('ID')},
-		{fieldname:'owner', fieldtype:'Data', label:__('Created By')},
+		{fieldname:'owner', fieldtype:'Link', label:__('Created By'), options: 'User'},
 		{fieldname:'idx', fieldtype:'Int', label:__('Index')},
 		{fieldname:'creation', fieldtype:'Date', label:__('Created On')},
 		{fieldname:'modified', fieldtype:'Date', label:__('Last Updated On')},

frappe/utils/jinja.py

@@ -156,12 +156,9 @@ def get_allowed_functions_for_jenv():
 			"escape": frappe.db.escape,
 		}
 
-	if getattr(frappe.local, "site", None):
-		# load jenv methods from hooks.py
-		for app in frappe.get_installed_apps():
-			for jenv_method in frappe.get_hooks(app_name=app).get('jenv', {"methods": []})["methods"]:
-				method_name, method_definition = jenv_method.split(":")
-				out[method_name] = frappe.get_attr(method_definition)
+	# load jenv methods from hooks.py
+	for method_name, method_definition in get_jenv_customization("methods"):
+		out[method_name] = frappe.get_attr(method_definition)
 
 	return out
 
@@ -211,7 +208,16 @@ def set_filters(jenv):
 	if frappe.flags.in_setup_help: return
 
 	# load jenv_filters from hooks.py
-	for app in frappe.get_installed_apps():
-		for jenv_filter in frappe.get_hooks(app_name=app).get('jenv', {"filters": []})["filters"]:
-			filter_name, filter_function = jenv_filter.split(":")
-			jenv.filters[filter_name] = frappe.get_attr(filter_function)
+	for filter_name, filter_function in get_jenv_customization("filters"):
+		jenv.filters[filter_name] = frappe.get_attr(filter_function)
+
+def get_jenv_customization(customizable_type):
+	import frappe
+
+	if getattr(frappe.local, "site", None):
+		for app in frappe.get_installed_apps():
+			for jenv_customizable, jenv_customizable_definition in frappe.get_hooks(app_name=app).get("jenv", {}).items():
+				if customizable_type == jenv_customizable:
+					for data in jenv_customizable_definition:
+						split_data = data.split(":")
+						yield split_data[0], split_data[1]