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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Rushabh Mehta 2017-05-19 22:43:06 +05:30
commit 6e3708de80
2 changed files with 4 additions and 4 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__ = '8.0.54'
__version__ = '8.0.55'
__title__ = "Frappe Framework"
local = Local()

6
frappe/public/js/frappe/ui/sort_selector.js
View file

@ -128,7 +128,7 @@ frappe.ui.SortSelector = Class.extend({
// meta sort field
if(meta_sort_field) _options.push({ 'fieldname': meta_sort_field });
// more default options
_options.push(
{'fieldname': 'name'},
@ -163,8 +163,8 @@ frappe.ui.SortSelector = Class.extend({
}
} else {
return {
meta_sort_field: meta.sort_field,
meta_sort_order: meta.sort_order.toLowerCase()
meta_sort_field: meta.sort_field || 'modified',
meta_sort_order: meta.sort_order ? meta.sort_order.toLowerCase() : ''
}
}
},