From 8c46ee4e43ab54e8e35fef8db154051ddd1fb216 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 16 Nov 2012 14:25:02 +0530 Subject: [PATCH] fixes to rename_tool, added serial no for rename --- core/doctype/doctype/doctype.py | 2 ++ public/js/legacy/widgets/form/fields.js | 7 +++++++ public/js/wn/views/doclistview.js | 1 - public/js/wn/views/reportview.js | 3 ++- webnotes/model/rename_doc.py | 11 ++++++++++- 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/core/doctype/doctype/doctype.py b/core/doctype/doctype/doctype.py index 8c1530044c..10029e52e2 100644 --- a/core/doctype/doctype/doctype.py +++ b/core/doctype/doctype/doctype.py @@ -192,6 +192,8 @@ def validate_fields(fields): if not d.options: webnotes.msgprint("""#%(idx)s %(label)s: Options must be specified for Link and Table type fields""" % d.fields, raise_exception=1) + if d.options=="[Select]": + return if not webnotes.conn.exists("DocType", d.options): webnotes.msgprint("""#%(idx)s %(label)s: Options %(options)s must be a valid "DocType" for Link and Table type fields""" % d.fields, raise_exception=1) diff --git a/public/js/legacy/widgets/form/fields.js b/public/js/legacy/widgets/form/fields.js index d4ca0d4b5a..767d7eb0e3 100644 --- a/public/js/legacy/widgets/form/fields.js +++ b/public/js/legacy/widgets/form/fields.js @@ -709,6 +709,13 @@ LinkField.prototype.set_input_value = function(val) { LinkField.prototype.validate_link = function(val, from_selector) { // validate the value just entered var me = this; + + if(this.df.options=="[Select]") { + $(me.txt).val(val); + me.run_trigger(); + return; + } + var fetch = ''; if(cur_frm.fetch_dict[me.df.fieldname]) fetch = cur_frm.fetch_dict[me.df.fieldname].columns.join(', '); diff --git a/public/js/wn/views/doclistview.js b/public/js/wn/views/doclistview.js index c48071864b..b603fea67b 100644 --- a/public/js/wn/views/doclistview.js +++ b/public/js/wn/views/doclistview.js @@ -196,7 +196,6 @@ wn.views.DocListView = wn.ui.Listing.extend({ function(inp) { return $(inp).attr('data-docstatus'); }) : [] - console.log(docstatus_list) var args = { doctype: this.doctype, diff --git a/public/js/wn/views/reportview.js b/public/js/wn/views/reportview.js index 8c277d887c..75c229b00b 100644 --- a/public/js/wn/views/reportview.js +++ b/public/js/wn/views/reportview.js @@ -55,8 +55,9 @@ wn.views.ReportView = wn.ui.Listing.extend({ }, setup: function() { var me = this; + this.page_title = 'Report: ' + (this.docname ? (this.doctype + ' - ' + this.docname) : this.doctype); + this.page.appframe.set_title(this.page_title) this.make({ - title: 'Report: ' + (this.docname ? (this.doctype + ' - ' + this.docname) : this.doctype), appframe: this.page.appframe, method: 'webnotes.widgets.doclistview.get', get_args: this.get_args, diff --git a/webnotes/model/rename_doc.py b/webnotes/model/rename_doc.py index 204ecc584d..7cb36fcfbb 100644 --- a/webnotes/model/rename_doc.py +++ b/webnotes/model/rename_doc.py @@ -8,9 +8,18 @@ def rename_doc(doctype, old, new, is_doctype=0, debug=0): """ import webnotes.utils import webnotes.model.doctype + from webnotes.model.code import get_obj + + if webnotes.conn.exists(doctype, new): + webnotes.msgprint("%s: %s exists, select a new, new name." % (doctype, new)) - # get doclist of given doctype # without child fields of table type fields (form=0) + # call on_rename method if exists + obj = get_obj(doctype, old) + if hasattr(obj, 'on_rename'): + obj.on_rename(new, old) + + # get doclist of given doctype doclist = webnotes.model.doctype.get(doctype, form=0) # rename the doc