From 144efb6499a0bd88ec4a7f58f0bae1f8fc520b7d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 22 Apr 2016 17:21:48 +0530 Subject: [PATCH] [cleanup] control get_value for dialog fields --- frappe/public/css/list.css | 3 +++ frappe/public/js/frappe/form/control.js | 11 ++++++----- frappe/public/js/frappe/ui/messages.js | 5 ++++- frappe/public/less/list.less | 6 ++++++ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/frappe/public/css/list.css b/frappe/public/css/list.css index 1c909e44d0..2f6110386f 100644 --- a/frappe/public/css/list.css +++ b/frappe/public/css/list.css @@ -4,6 +4,9 @@ .result-list { min-height: 200px; } +.sort-selector .dropdown:hover { + text-decoration: underline; +} .list-filters { position: relative; } diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index 503c484674..6a3aac95a3 100644 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -403,14 +403,15 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({ this.$input.addClass(this.df.input_class); } }, - set_input: function(val) { - this.$input && this.$input.val(this.format_for_input(val)); + set_input: function(value) { + this.value = value; + this.$input && this.$input.val(this.format_for_input(value)); this.set_disp_area(); - this.last_value = val; - this.set_mandatory && this.set_mandatory(val); + this.last_value = value; + this.set_mandatory && this.set_mandatory(value); }, get_value: function() { - return this.$input ? this.$input.val() : undefined; + return this.$input && this.$input.val() || this.value; }, format_for_input: function(val) { return val==null ? "" : val; diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js index 0a67e6d717..0b99aeccde 100644 --- a/frappe/public/js/frappe/ui/messages.js +++ b/frappe/public/js/frappe/ui/messages.js @@ -210,7 +210,7 @@ frappe.hide_progress = function() { } // Floating Message -function show_alert(txt, seconds) { +frappe.show_alert = function(txt, seconds) { if(!$('#dialog-container').length) { $('
').appendTo('body'); } @@ -229,3 +229,6 @@ function show_alert(txt, seconds) { div.delay(seconds ? seconds * 1000 : 3000).fadeOut(300); return div; } + +// for backward compatibility +var show_alert = frappe.show_alert; diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less index 1dcde43da9..20b3bbf6c7 100644 --- a/frappe/public/less/list.less +++ b/frappe/public/less/list.less @@ -8,6 +8,12 @@ min-height: 200px; } +.sort-selector { + .dropdown:hover { + text-decoration: underline; + } +} + .list-filters { position: relative;