瀏覽代碼

Merge branch 'develop'

version-14
mbauskar 8 年之前
父節點
當前提交
3e4bbce256
共有 4 個檔案被更改,包括 21 行新增6 行删除
  1. +1
    -1
      frappe/__init__.py
  2. +4
    -2
      frappe/public/js/frappe/list/list_view.js
  3. +10
    -1
      frappe/public/js/frappe/ui/base_list.js
  4. +6
    -2
      frappe/public/js/frappe/views/reports/reportview.js

+ 1
- 1
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

__version__ = '8.2.0'
__version__ = '8.2.1'
__title__ = "Frappe Framework"

local = Local()


+ 4
- 2
frappe/public/js/frappe/list/list_view.js 查看文件

@@ -497,8 +497,10 @@ frappe.views.ListView = frappe.ui.BaseList.extend({
}
}

this.list_header.find('.list-liked-by-me')
.toggleClass('text-extra-muted not-liked', !this.is_star_filtered());
if(this.list_header) {
this.list_header.find('.list-liked-by-me')
.toggleClass('text-extra-muted not-liked', !this.is_star_filtered());
}

this.last_updated_on = new Date();
this.dirty = false;


+ 10
- 1
frappe/public/js/frappe/ui/base_list.js 查看文件

@@ -189,16 +189,25 @@ frappe.ui.BaseList = Class.extend({
options:this.doctype,
label:'ID',
fieldname:'name',
onchange: () => { me.refresh(true); }
});

var has_standard_filters = false;
this.meta.fields.forEach(function(df) {
if(df.in_standard_filter) {
if(df.fieldtype == "Select") {
var options = df.options.split("\n")
if(options.length > 0 && options[0] != ""){
options.unshift("");
df.options = options.join("\n");
}
}
me.page.add_field({
fieldtype: df.fieldtype,
label: __(df.label),
options: df.options,
fieldname: df.fieldname
fieldname: df.fieldname,
onchange: () => {me.refresh(true);}
});
}
});


+ 6
- 2
frappe/public/js/frappe/views/reports/reportview.js 查看文件

@@ -260,7 +260,7 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
// build args for query
get_args: function() {
let me = this;
let filters = this.filter_list.get_filters();
let filters = this.filter_list? this.filter_list.get_filters(): [];

return {
doctype: this.doctype,
@@ -284,7 +284,7 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
}

// second
if(this.sort_by_next_select.val()) {
if(this.sort_by_next_select && this.sort_by_next_select.val()) {
order_by.push(this.get_selected_table_and_column(this.sort_by_next_select)
+ ' ' + this.sort_order_next_select.val());
}
@@ -293,6 +293,10 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
},

get_selected_table_and_column: function(select) {
if(!select) {
return
}

return select.selected_doctype ?
this.get_full_column_name([select.selected_fieldname, select.selected_doctype]) : "";
},


Loading…
取消
儲存