From 2b846cfd0a47cf64db2aaa33448fe19110e93943 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 28 May 2013 17:01:32 +0530 Subject: [PATCH] [form] usability fixes --- core/doctype/communication/communication.py | 1 + public/css/ui/common.css | 2 +- public/js/wn/form/control.js | 7 +++++++ public/js/wn/form/layout.js | 2 +- public/js/wn/views/listview.js | 3 --- public/js/wn/views/query_report.js | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/core/doctype/communication/communication.py b/core/doctype/communication/communication.py index 56366a6d6e..cfa9e3331c 100644 --- a/core/doctype/communication/communication.py +++ b/core/doctype/communication/communication.py @@ -64,6 +64,7 @@ def make(doctype=None, name=None, content=None, subject=None, d.communication_medium = communication_medium if send_email: send_comm_email(d, name, sent_via, print_html, attachments, send_me_a_copy) + webnotes.msgprint(d.fields) d.save(1, ignore_fields=True) def send_comm_email(d, name, sent_via=None, print_html=None, attachments='[]', send_me_a_copy=False): diff --git a/public/css/ui/common.css b/public/css/ui/common.css index 2c2019603b..dd0bbff188 100644 --- a/public/css/ui/common.css +++ b/public/css/ui/common.css @@ -204,7 +204,7 @@ a { .missing-image { background-color: #eee; padding: 40px; - width: 32px; + width: 112px; font-size: 32px; color: #888; } diff --git a/public/js/wn/form/control.js b/public/js/wn/form/control.js index 66ca32e721..de5a64b11a 100644 --- a/public/js/wn/form/control.js +++ b/public/js/wn/form/control.js @@ -492,6 +492,13 @@ wn.ui.form.ControlSelect = wn.ui.form.ControlData.extend({ me.frm.attachments.new_attachment(); }) .appendTo(this.input_area); + + $(document).on("upload_complete", function(event, filename, file_url) { + if(cur_frm === me.frm) { + me.set_options(); + me.set_input(filename ? ("files/" + filename) : file_url); + } + }) }, set_options: function() { var options = this.df.options || []; diff --git a/public/js/wn/form/layout.js b/public/js/wn/form/layout.js index 782adc6e1a..a8c6cc061c 100644 --- a/public/js/wn/form/layout.js +++ b/public/js/wn/form/layout.js @@ -90,7 +90,7 @@ wn.ui.form.Layout = Class.extend({ var me = this; this.wrapper.on("keydown", function(ev) { if(ev.which==9) { - var current = $(ev.target), + var current = $(ev.target).trigger("change"), doctype = current.attr("data-doctype"), fieldname = current.attr("data-fieldname"); if(doctype) diff --git a/public/js/wn/views/listview.js b/public/js/wn/views/listview.js index 515063308f..598acd25e5 100644 --- a/public/js/wn/views/listview.js +++ b/public/js/wn/views/listview.js @@ -121,9 +121,6 @@ wn.views.ListView = Class.extend({ $.each(this.columns, function(i, c) { if(c.content==="name") { c.colspan = 4; return false; } }); } - - console.log(this.columns); - }, render: function(row, data) { this.prepare_data(data); diff --git a/public/js/wn/views/query_report.js b/public/js/wn/views/query_report.js index c9958dca7d..2d4f3c99d9 100644 --- a/public/js/wn/views/query_report.js +++ b/public/js/wn/views/query_report.js @@ -87,7 +87,7 @@ wn.views.QueryReport = Class.extend({ if(me.report_name!=route[1]) { me.report_name = route[1]; this.wrapper.find(".no-report-area").toggle(false); - me.appframe.title(wn._("Query Report")+": " + me.report_name); + me.appframe.set_title(wn._("Query Report")+": " + me.report_name); if(!wn.query_reports[me.report_name]) { wn.call({