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

[control] use get_parsed_value instead of get_value

Browse source
This commit is contained in:
Rushabh Mehta 2013-05-31 12:49:35 +05:30
parent b97c332639
commit e5ed3cfdb5
6 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
public/js/wn/form/assign_to.js
View file

@ -112,18 +112,15 @@ wn.ui.form.AssignTo = Class.extend({
me.dialog.fields_dict.add_btn.input.onclick = function() {
var assign_to = me.dialog.fields_dict.assign_to.get_value();
var args = me.dialog.get_values();
if(assign_to) {
wn.call({
method:'webnotes.widgets.form.assign_to.add',
args: {
args: $.extend(args, {
doctype: me.frm.doctype,
name: me.frm.docname,
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) {
if(!r.exc) {
me.render(r.message);

2
public/js/wn/form/control.js
View file

@ -340,7 +340,7 @@ wn.ui.form.ControlDate = wn.ui.form.ControlData.extend({
this.$input.datepicker(this.datepicker_options);
},
parse: function(value) {
return dateutil.user_to_str(value);
return value ? dateutil.user_to_str(value) : value;
},
format_for_input: function(value) {
return dateutil.str_to_user(value);

8
public/js/wn/ui/filters.js
View file

@ -72,7 +72,7 @@ wn.ui.FilterList = Class.extend({
var values = [];
$.each(this.filters, function(i, f) {
if(f.field)
values.push(f.get_value());
values.push(f.get_parsed_value());
})
return values;
},
@ -141,7 +141,7 @@ wn.ui.Filter = Class.extend({
this.$w.find('a.close').bind('click', function() {
me.$w.css('display','none');
var value = me.field.get_value();
var value = me.field.get_parsed_value();
var fieldname = me.field.df.fieldname;
me.field = null;
@ -236,7 +236,7 @@ wn.ui.Filter = Class.extend({
// save old text
var old_text = null;
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);
@ -299,7 +299,7 @@ wn.ui.Filter = Class.extend({
get_value: function() {
var me = this;
var val = me.field.get_value();
var val = me.field.get_parsed_value();
var cond = me.$w.find('.condition').val();
if(me.field.df.original_type == 'Check') {

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

@ -346,7 +346,7 @@ wn.ui.Listing = Class.extend({
var filter = this.filter_list.get_filter(fieldname);
//this.filter_list.show_filters(true);
if(filter) {
var v = filter.field.get_value();
var v = filter.field.get_parsed_value();
if(v.indexOf(label)!=-1) {
// already set
return false;

4
public/js/wn/views/doclistview.js
View file

@ -39,7 +39,7 @@ wn.views.DocListView = wn.ui.Listing.extend({
var page = wn.container.add_page(page_name);
wn.container.change_to(page_name);
page.doclistview = this;
this.$page = $(page);
this.$page = $(page).css({"min-height": "400px"});
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) {
var filter = this.filter_list.get_filter(fieldname);
if(filter) {
var v = cstr(filter.field.get_value());
var v = cstr(filter.field.get_parsed_value());
if(v.indexOf(label)!=-1) {
// already set
return false;

2
webnotes/widgets/form/assign_to.py
View file

@ -53,7 +53,7 @@ def add(args=None):
d.owner = args['assign_to']
d.reference_type = args['doctype']
d.reference_name = args['name']
d.description = args['description']
d.description = args.get('description')
d.priority = args.get('priority', 'Medium')
d.date = args.get('date', nowdate())
d.assigned_by = args.get('assigned_by', webnotes.user.name)