From 3992715e0f16c54ff657db08f9d8df6c740fb677 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 9 Mar 2012 17:51:46 +0530 Subject: [PATCH 1/2] search selector fix for link --- css/ui/list.css | 5 +++++ js/legacy/webpage/search.js | 15 ++++++++++----- js/wn/ui/listing.js | 16 ++++++++-------- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/css/ui/list.css b/css/ui/list.css index 243d40399b..c56d33a0f9 100644 --- a/css/ui/list.css +++ b/css/ui/list.css @@ -21,6 +21,11 @@ div.list-row:hover { background-color: #eef } +div.paging-button { + text-align: center; + padding: 11px 0px; +} + div.show_filters { display: none; } diff --git a/js/legacy/webpage/search.js b/js/legacy/webpage/search.js index 503c033463..2a7197a6d1 100644 --- a/js/legacy/webpage/search.js +++ b/js/legacy/webpage/search.js @@ -27,7 +27,7 @@ search_fields = {}; function setlinkvalue(name) { //selector.input.set(name);// in local - this will be set onchange - selector.input.set_input(name); // on screen + selector.input.set_input_value(name); // on screen selector.hide(); } @@ -130,8 +130,8 @@ function makeselector() { } } d.onhide = function() { - if(d.input && d.input.txt) // link, call onchange - d.input.txt.onchange() + //if(d.input && d.input.txt) // link, call onchange + // d.input.txt.set_input_value() } btn.onclick = function() { @@ -191,10 +191,15 @@ function makeselector() { var w = $a(d.rows['Result'],'div','',{height:'240px',overflow:'auto',margin:'4px'}); for(var i=0; i\
\ -
\ +
\ \ \ -
\ -
\ +
\ +
\ \ \ ', this.opts)); @@ -168,17 +168,17 @@ wn.ui.Listing = Class.extend({ newdoc(me.new_doctype); }) } else { - this.$w.find('.btn-new').toggle(false).attr('hidden', 'true'); + this.$w.find('.btn-new').toggle(false).attr('hidden', 'hidden'); } // hide-filter if(!me.show_filters) { - this.$w.find('.btn-filter').toggle(false).attr('hidden', 'true'); + this.$w.find('.btn-filter').toggle(false).attr('hidden', 'hidden'); } // hide-refresh if(this.hide_refresh || this.no_refresh) { - this.$w.find('.btn-refresh').toggle(false).attr('hidden', 'true'); + this.$w.find('.btn-refresh').toggle(false).attr('hidden', 'hidden'); } // toggle-view @@ -187,7 +187,7 @@ wn.ui.Listing = Class.extend({ } // btn group only if more than 1 button - if(this.$w.find('.list-toolbar [hidden!="true"]').length>1) { + if(this.$w.find('.list-toolbar a[hidden!="hidden"]').length>1) { this.$w.find('.list-toolbar').addClass('btn-group') } }, @@ -216,7 +216,7 @@ wn.ui.Listing = Class.extend({ this.onrun = a0; if(a0 && a0.callback) this.onrun = a0.callback; - if(!a1 || (a0 && a0.append)) + if(!a1 && !(a0 && a0.append)) this.start = 0; me.$w.find('.img-load').toggle(true); From 450d711362234ff05c86fc7005fece832edb153d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 9 Mar 2012 18:16:01 +0530 Subject: [PATCH 2/2] datafield onupdate chain broken - fix --- js/legacy/widgets/form/fields.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/js/legacy/widgets/form/fields.js b/js/legacy/widgets/form/fields.js index 25eafad25f..47e45ad448 100644 --- a/js/legacy/widgets/form/fields.js +++ b/js/legacy/widgets/form/fields.js @@ -408,6 +408,11 @@ DataField.prototype.make_input = function() { } this.input.name = this.df.fieldname; + + $(this.input).change(function() { + me.set_value($(this).val()); + }); + this.set_value = function(val) { if(!me.last_value)me.last_value=''; @@ -457,7 +462,7 @@ DataField.prototype.make_input = function() { }); }, select: function(event, ui) { - me.set_value(ui.item.value); + me.set_input_value(ui.item.value); return false; } }); @@ -753,12 +758,6 @@ LinkField.prototype.set_input_value = function(val) { ); } -LinkField.prototype.set_onchange = function() { - var me = this; - $(me.txt).change(function(event) { - - }); -} LinkField.prototype.set_fetch_values = function(fetch_values) { var fl = cur_frm.fetch_dict[this.df.fieldname].fields; var changed_fields = [];