@@ -112,18 +112,15 @@ wn.ui.form.AssignTo = Class.extend({ | |||||
me.dialog.fields_dict.add_btn.input.onclick = function() { | me.dialog.fields_dict.add_btn.input.onclick = function() { | ||||
var assign_to = me.dialog.fields_dict.assign_to.get_value(); | var assign_to = me.dialog.fields_dict.assign_to.get_value(); | ||||
var args = me.dialog.get_values(); | |||||
if(assign_to) { | if(assign_to) { | ||||
wn.call({ | wn.call({ | ||||
method:'webnotes.widgets.form.assign_to.add', | method:'webnotes.widgets.form.assign_to.add', | ||||
args: { | |||||
args: $.extend(args, { | |||||
doctype: me.frm.doctype, | doctype: me.frm.doctype, | ||||
name: me.frm.docname, | name: me.frm.docname, | ||||
assign_to: assign_to, | assign_to: assign_to, | ||||
description: me.dialog.fields_dict.description.get_value(), | |||||
priority: me.dialog.fields_dict.priority.get_value(), | |||||
date: me.dialog.fields_dict.date.get_value(), | |||||
notify: me.dialog.fields_dict.notify.get_value() | |||||
}, | |||||
}), | |||||
callback: function(r,rt) { | callback: function(r,rt) { | ||||
if(!r.exc) { | if(!r.exc) { | ||||
me.render(r.message); | me.render(r.message); | ||||
@@ -340,7 +340,7 @@ wn.ui.form.ControlDate = wn.ui.form.ControlData.extend({ | |||||
this.$input.datepicker(this.datepicker_options); | this.$input.datepicker(this.datepicker_options); | ||||
}, | }, | ||||
parse: function(value) { | parse: function(value) { | ||||
return dateutil.user_to_str(value); | |||||
return value ? dateutil.user_to_str(value) : value; | |||||
}, | }, | ||||
format_for_input: function(value) { | format_for_input: function(value) { | ||||
return dateutil.str_to_user(value); | return dateutil.str_to_user(value); | ||||
@@ -72,7 +72,7 @@ wn.ui.FilterList = Class.extend({ | |||||
var values = []; | var values = []; | ||||
$.each(this.filters, function(i, f) { | $.each(this.filters, function(i, f) { | ||||
if(f.field) | if(f.field) | ||||
values.push(f.get_value()); | |||||
values.push(f.get_parsed_value()); | |||||
}) | }) | ||||
return values; | return values; | ||||
}, | }, | ||||
@@ -141,7 +141,7 @@ wn.ui.Filter = Class.extend({ | |||||
this.$w.find('a.close').bind('click', function() { | this.$w.find('a.close').bind('click', function() { | ||||
me.$w.css('display','none'); | me.$w.css('display','none'); | ||||
var value = me.field.get_value(); | |||||
var value = me.field.get_parsed_value(); | |||||
var fieldname = me.field.df.fieldname; | var fieldname = me.field.df.fieldname; | ||||
me.field = null; | me.field = null; | ||||
@@ -236,7 +236,7 @@ wn.ui.Filter = Class.extend({ | |||||
// save old text | // save old text | ||||
var old_text = null; | var old_text = null; | ||||
if(me.field) { | if(me.field) { | ||||
old_text = me.field.get_value(); | |||||
old_text = me.field.get_parsed_value(); | |||||
} | } | ||||
var field_area = me.$w.find('.filter_field').empty().get(0); | var field_area = me.$w.find('.filter_field').empty().get(0); | ||||
@@ -299,7 +299,7 @@ wn.ui.Filter = Class.extend({ | |||||
get_value: function() { | get_value: function() { | ||||
var me = this; | var me = this; | ||||
var val = me.field.get_value(); | |||||
var val = me.field.get_parsed_value(); | |||||
var cond = me.$w.find('.condition').val(); | var cond = me.$w.find('.condition').val(); | ||||
if(me.field.df.original_type == 'Check') { | if(me.field.df.original_type == 'Check') { | ||||
@@ -346,7 +346,7 @@ wn.ui.Listing = Class.extend({ | |||||
var filter = this.filter_list.get_filter(fieldname); | var filter = this.filter_list.get_filter(fieldname); | ||||
//this.filter_list.show_filters(true); | //this.filter_list.show_filters(true); | ||||
if(filter) { | if(filter) { | ||||
var v = filter.field.get_value(); | |||||
var v = filter.field.get_parsed_value(); | |||||
if(v.indexOf(label)!=-1) { | if(v.indexOf(label)!=-1) { | ||||
// already set | // already set | ||||
return false; | return false; | ||||
@@ -39,7 +39,7 @@ wn.views.DocListView = wn.ui.Listing.extend({ | |||||
var page = wn.container.add_page(page_name); | var page = wn.container.add_page(page_name); | ||||
wn.container.change_to(page_name); | wn.container.change_to(page_name); | ||||
page.doclistview = this; | page.doclistview = this; | ||||
this.$page = $(page); | |||||
this.$page = $(page).css({"min-height": "400px"}); | |||||
wn.dom.set_style(".show-docstatus div { font-size: 90%; }"); | wn.dom.set_style(".show-docstatus div { font-size: 90%; }"); | ||||
@@ -261,7 +261,7 @@ wn.views.DocListView = wn.ui.Listing.extend({ | |||||
set_filter: function(fieldname, label, no_run) { | set_filter: function(fieldname, label, no_run) { | ||||
var filter = this.filter_list.get_filter(fieldname); | var filter = this.filter_list.get_filter(fieldname); | ||||
if(filter) { | if(filter) { | ||||
var v = cstr(filter.field.get_value()); | |||||
var v = cstr(filter.field.get_parsed_value()); | |||||
if(v.indexOf(label)!=-1) { | if(v.indexOf(label)!=-1) { | ||||
// already set | // already set | ||||
return false; | return false; | ||||
@@ -53,7 +53,7 @@ def add(args=None): | |||||
d.owner = args['assign_to'] | d.owner = args['assign_to'] | ||||
d.reference_type = args['doctype'] | d.reference_type = args['doctype'] | ||||
d.reference_name = args['name'] | d.reference_name = args['name'] | ||||
d.description = args['description'] | |||||
d.description = args.get('description') | |||||
d.priority = args.get('priority', 'Medium') | d.priority = args.get('priority', 'Medium') | ||||
d.date = args.get('date', nowdate()) | d.date = args.get('date', nowdate()) | ||||
d.assigned_by = args.get('assigned_by', webnotes.user.name) | d.assigned_by = args.get('assigned_by', webnotes.user.name) | ||||