diff --git a/core/doctype/doctype/doctype.txt b/core/doctype/doctype/doctype.txt index 53ca42b7a4..38650a38c1 100644 --- a/core/doctype/doctype/doctype.txt +++ b/core/doctype/doctype/doctype.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - u'creation': '2012-07-12 22:19:54', + u'creation': '2012-10-15 17:50:35', u'docstatus': 0, - u'modified': '2012-10-15 17:42:42', + u'modified': '2012-11-16 12:14:02', u'modified_by': u'Administrator', u'owner': u'Administrator' }, @@ -77,11 +77,11 @@ { u'doctype': u'DocField', 'fieldname': u'module', - 'fieldtype': u'Data', + 'fieldtype': u'Link', 'label': u'Module', 'oldfieldname': u'module', 'oldfieldtype': u'Link', - 'options': u'Suggest', + 'options': u'Module Def', 'reqd': 1 }, @@ -487,18 +487,12 @@ 'role': u'System Manager' }, - # DocPerm - { - u'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'System Manager' - }, - # DocPerm { 'cancel': 0, 'create': 1, u'doctype': u'DocPerm', + 'execute': 0, 'permlevel': 0, 'role': u'Administrator', 'submit': 0, diff --git a/public/js/legacy/widgets/form/form.js b/public/js/legacy/widgets/form/form.js index 6c80da42fc..17e525955a 100644 --- a/public/js/legacy/widgets/form/form.js +++ b/public/js/legacy/widgets/form/form.js @@ -120,6 +120,7 @@ _f.Frm.prototype.setup_print_layout = function() { wn.ui.make_app_page({ parent: this.print_wrapper, single_column: true, + set_document_title: false, title: me.doctype + ": Print View", module: me.meta.module }); diff --git a/public/js/wn/ui/appframe.js b/public/js/wn/ui/appframe.js index d9ffb9a861..c22765c38d 100644 --- a/public/js/wn/ui/appframe.js +++ b/public/js/wn/ui/appframe.js @@ -1,5 +1,6 @@ wn.ui.AppFrame = Class.extend({ init: function(parent, title, module) { + this.set_document_title = true; this.buttons = {}; this.$w = $('
').appendTo(parent); @@ -24,7 +25,8 @@ wn.ui.AppFrame = Class.extend({ this.set_title(txt); }, set_title: function(txt) { - document.title = txt; + if(this.set_document_title) + document.title = txt; this.$titlebar.find(".appframe-title").html(txt); }, set_marker: function(module) { @@ -131,6 +133,8 @@ wn.ui.make_app_page = function(opts) { '); } opts.parent.appframe = new wn.ui.AppFrame($(opts.parent).find('.layout-appframe')); + if(opts.set_document_title!==undefined) + opts.parent.appframe.set_document_title = opts.set_document_title; if(opts.title) opts.parent.appframe.title(opts.title); if(opts.module) opts.parent.appframe.set_marker(opts.module); } \ No newline at end of file diff --git a/public/js/wn/ui/dialog.js b/public/js/wn/ui/dialog.js index 2385f2250e..e1e2c3585b 100644 --- a/public/js/wn/ui/dialog.js +++ b/public/js/wn/ui/dialog.js @@ -53,6 +53,7 @@ wn.ui.Dialog = wn.ui.FieldGroup.extend({ make_head: function() { var me = this; this.appframe = new wn.ui.AppFrame(this.wrapper); + this.appframe.set_document_title = false; this.appframe.$titlebar.find('.close').unbind('click').click(function() { if(me.oncancel)me.oncancel(); me.hide(); });