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

Merge branch 'master' of https://github.com/webnotes/wnframework

Browse source
This commit is contained in:
Akhilesh Darjee 2013-04-05 18:49:17 +05:30
commit 9415ed6ce0
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
public/js/legacy/widgets/form/fields.js
View file

@ -613,7 +613,7 @@ LinkField.prototype.make_input = function() {
// setup buttons
me.setup_buttons();
}
me.onrefresh = function() {
var can_create = in_list(wn.boot.profile.can_create, me.df.options);
var can_read = in_list(wn.boot.profile.can_read, me.df.options);
@ -632,12 +632,13 @@ LinkField.prototype.make_input = function() {
}
me.get_value = function() { return me.txt.value; }
// increasing zindex of input to increase zindex of autosuggest
// because of the increase in zindex of dialog_wrapper
if(cur_dialog) {
console.log(cint($(cur_dialog.wrapper).css("z-index")) + 1)
$(me.txt).css({"z-index": cint($(cur_dialog.wrapper).css("z-index")) + 1});
if(cur_dialog || me.dialog_wrapper) {
var $dialog_wrapper = $(cur_dialog ? cur_dialog.wrapper : me.dialog_wrapper)
var zindex = cint($dialog_wrapper.css("z-index"));
$(me.txt).css({"z-index": (zindex >= 10 ? zindex : 10) + 1});
}
$(me.txt).autocomplete({
@ -1139,6 +1140,7 @@ SelectField.prototype.make_input = function() {
else
var v = null;
}
this.input.set_input(v);
}

2
public/js/wn/ui/dialog.js
View file

@ -30,6 +30,8 @@ wn.ui.Dialog = wn.ui.FieldGroup.extend({
$.extend(this, opts);
this.make();
this.dialog_wrapper = this.wrapper;
// init fields
if(this.fields) {
this.parent = this.body

1
public/js/wn/ui/field_group.js
View file

@ -43,6 +43,7 @@ wn.ui.FieldGroup = Class.extend({
var div = $a(this.parent, 'div', '', {margin:'6px 0px'})
f = make_field(df, null, div, null);
f.not_in_form = 1;
f.dialog_wrapper = this.dialog_wrapper || null;
this.fields_dict[df.fieldname] = f
f.refresh();

2
webnotes/widgets/reportview.py
View file

@ -63,7 +63,7 @@ def execute(doctype, query=None, filters=None, fields=None, docstatus=None,
query = """select %(fields)s from %(tables)s where %(conditions)s
%(group_by)s order by %(order_by)s %(limit)s""" % args
return webnotes.conn.sql(query, as_dict=1, debug=1)
return webnotes.conn.sql(query, as_dict=1)
def prepare_args(doctype, filters, fields, docstatus, group_by, order_by):
global tables