').appendTo(me.input_area);
-
- me.txt = $('')
- .appendTo(me.input_group).get(0);
-
- me.input_group_btn = $('
').appendTo(me.input_group);
-
- me.btn = $('').appendTo(me.input_group_btn).get(0);
- me.btn1 = $('').appendTo(me.input_group_btn).get(0);
- me.btn2 = $('').appendTo(me.input_group_btn).get(0);
-
- me.txt.name = me.df.fieldname;
- me.setdisabled = function(tf) { me.txt.disabled = tf; }
-
- // setup buttons
- me.setup_buttons();
- }
-
- me.onrefresh = function() {
- var can_create = in_list(wn.boot.profile.can_create, me.df.options);
- var can_read = in_list(wn.boot.profile.can_read, me.df.options);
- if(!can_create) $(this.btn2).remove();
- if(!can_read) $(this.btn1).remove();
- }
-
- me.onrefresh();
-
- me.txt.field_object = this;
- // set onchange triggers
-
- me.input.set_input = function(val) {
- if(val==undefined)val='';
- me.txt.value = val;
- me.last_value = val;
- }
-
- me.get_value = function() { return me.txt.value; }
-
- // increasing zindex of input to increase zindex of autosuggest
- // because of the increase in zindex of dialog_wrapper
- if(cur_dialog || me.dialog_wrapper) {
- var $dialog_wrapper = $(cur_dialog ? cur_dialog.wrapper : me.dialog_wrapper)
- var zindex = cint($dialog_wrapper.css("z-index"));
- $(me.txt).css({"z-index": (zindex >= 10 ? zindex : 10) + 1});
- }
-
- $(me.txt).autocomplete({
- source: function(request, response) {
- var args = {
- 'txt': request.term,
- 'dt': me.df.options,
- };
-
- var q = me.get_custom_query();
- if (typeof(q)==="string") {
- args.query = q;
- } else if($.isPlainObject(q)) {
- if(q.filters) {
- $.each(q.filters, function(key, value) {
- q.filters[key] = value===undefined ? null : value;
- });
- }
- $.extend(args, q);
- }
-
- wn.call({
- method:'webnotes.widgets.search.search_link',
- args: args,
- callback: function(r) {
- response(r.results);
- },
- });
- },
- select: function(event, ui) {
- me.set_input_value(ui.item.value);
- }
- }).data('autocomplete')._renderItem = function(ul, item) {
- return $('')
- .data('item.autocomplete', item)
- .append(repl('%(label)s
\ - %(info)s', - item)) - .appendTo(ul); - }; - - $(this.txt).change(function() { - var val = $(this).val();//me.get_value(); - - me.set_input_value_executed = false; - - if(!val) { - if(selector && selector.display) - return; - me.set_input_value(''); - } else { - // SetTimeout hack! if in put is set via autocomplete, do not validate twice - setTimeout(function() { - if (!me.set_input_value_executed) { - me.set_input_value(val); - } - }, 1000); - } - }) -} - -LinkField.prototype.get_custom_query = function() { - this.set_get_query(); - if(this.get_query) { - if(cur_frm) - var doc = locals[cur_frm.doctype][cur_frm.docname]; - return this.get_query(doc, this.doctype, this.docname); - } -} - -LinkField.prototype.setup_buttons = function() { - var me = this; - - // magnifier - search - me.btn.onclick = function() { - selector.set(me, me.df.options, me.df.label); - selector.show(me.txt); - } - - // open - if(me.btn1)me.btn1.onclick = function() { - if(me.txt.value && me.df.options) { loaddoc(me.df.options, me.txt.value); } - } - // add button - for inline creation of records - me.can_create = 0; - if((!me.not_in_form) && in_list(profile.can_create, me.df.options)) { - me.can_create = 1; - me.btn2.onclick = function() { - var on_save_callback = function(new_rec) { - if(new_rec) { - var d = _f.calling_doc_stack.pop(); // patch for composites - - locals[d[0]][d[1]][me.df.fieldname] = new_rec; - me.refresh(); - - if(me.grid)me.grid.refresh(); - - // call script - me.run_trigger(); - } - } - _f.calling_doc_stack.push([me.doctype, me.docname]); - new_doc(me.df.options); - } - } else { - $(me.btn2).remove(); - } -} - -LinkField.prototype.set_input_value = function(val) { - var me = this; - - // SetTimeout hack! if in put is set via autocomplete, do not validate twice - me.set_input_value_executed = true; - - var from_selector = false; - if(selector && selector.display) from_selector = true; - - // refresh mandatory style - me.refresh_label_icon(); - - // not in form, do nothing - if(me.not_in_form) { - $(this.txt).val(val); - return; - } - - // same value, do nothing - if(cur_frm) { - if(val == locals[me.doctype][me.docname][me.df.fieldname]) { - //me.set(val); // one more time, grid bug? - me.run_trigger(); // wanted - called as refresh? - return; - } - } - - // set in locals - me.set(val); - - // deselect cell if in grid - if(_f.cur_grid_cell) - _f.cur_grid_cell.grid.cell_deselect(); - - if(val) { - // validate only if val is not empty - me.validate_link(val, from_selector); - } else { - // run trigger if value is cleared - me.run_trigger(); - } -} - -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(', '); - - $c('webnotes.widgets.form.utils.validate_link', { - 'value':val, - 'options':me.df.options, - 'fetch': fetch - }, - function(r,rt) { - if(r.message=='Ok') { - // set fetch values - if($(me.txt).val()!=val) { - if((me.grid && !from_selector) || (!me.grid)) { - $(me.txt).val(val); - } - } - - if(r.fetch_values) - me.set_fetch_values(r.fetch_values); - - me.run_trigger(); - } else { - me.txt.value = ''; - me.set(''); - } - } - ); -} - -LinkField.prototype.set_fetch_values = function(fetch_values) { - var fl = cur_frm.fetch_dict[this.df.fieldname].fields; - var changed_fields = []; - for(var i=0; i< fl.length; i++) { - if(locals[this.doctype][this.docname][fl[i]]!=fetch_values[i]) { - locals[this.doctype][this.docname][fl[i]] = fetch_values[i]; - if(!this.grid) { - refresh_field(fl[i]); - - // call trigger on the target field - changed_fields.push(fl[i]); - } - } - } - - // run triggers - for(i=0; i"+val+"";
- this.set_disp_html(t);
-}
-
-
-function IntField() { } IntField.prototype = new DataField();
-IntField.prototype.validate = function(v) {
- if(isNaN(parseInt(v)))return null;
- return cint(v);
-};
-IntField.prototype.format_input = function() {
- if(this.input.value==null) this.input.value='';
-}
-
-// ======================================================================================
-
-function FloatField() { } FloatField.prototype = new DataField();
-FloatField.prototype.validate = function(v) {
- if(isNaN(parseFloat(v)))
- return null;
- else
- v = flt(v);
- return v;
-};
-FloatField.prototype.format_input = function() {
- if(this.input.value==null || this.input.value=='')
- this.input.value='';
- else {
- var format;
- if(this.get_field_currency) {
- format = get_number_format(this.get_field_currency());
- this.input.value =
- format_number(parseFloat(this.input.value), format);
- } else {
- var decimals = wn.boot.sysdefaults.float_precision ?
- parseInt(wn.boot.sysdefaults.float_precision) : null;
-
- this.input.value = format_number(parseFloat(this.input.value), null, decimals);
- }
- }
-}
-FloatField.prototype.onmake_input = function() {
- if(!this.input) return;
- this.input.onfocus = function() {
- this.select();
- }
-}
-FloatField.prototype.set_disp = function(val) {
- this.set_disp_html(wn.format(val, this.df, null, locals[this.doctype][this.name]));
-}
-
-function PercentField() { } PercentField.prototype = new FloatField();
-PercentField.prototype.set_disp = function(val) {
- this.set_disp_html(wn.format(val, this.df));
-}
-
-function CurrencyField() { } CurrencyField.prototype = new FloatField();
-
-CurrencyField.prototype.validate = function(v) {
- if(v==null || v=='')
- return 0;
-
- return flt(v, null, get_number_format(this.get_field_currency()));
-}
-
-CurrencyField.prototype.get_field_currency = function() {
- var doc = null;
- if(this.doctype && this.docname && locals[this.doctype])
- doc = locals[this.doctype][this.docname];
-
- return wn.meta.get_field_currency(this.df, doc);
-};
-
-CurrencyField.prototype.get_formatted = function(val) {
- if(!this.doctype)
- return val;
-
- return format_currency(val, this.get_field_currency());
-}
-CurrencyField.prototype.set_disp = function(val) {
- this.set_disp_html(this.get_formatted(val));
-}
-
-function CheckField() { } CheckField.prototype = new Field();
-CheckField.prototype.validate = function(v) {
- return cint(v);
-};
-CheckField.prototype.onmake = function() {
- this.checkimg = $("").appendTo(this.disp_area);
-}
-
-CheckField.prototype.make_input = function() { var me = this;
- this.input = $("")
- .appendTo(this.input_area)
- .css({"border":"0px", "margin-top":"-2px", "width": "16px"}).get(0);
-
- $(this.input).change(function() {
- me.set(this.checked ? 1 : 0);
- me.run_trigger();
- })
-
- this.input.set_input = function(v) {
- me.input.checked = cint(v) ? true : false;
- me.last_value = v;
- }
-
- this.get_value= function() {
- return this.input.checked ? 1 : 0;
- }
-
-}
-CheckField.prototype.set_disp = function(val) {
- this.checkimg.toggle(cint(val) ? true : false);
-}
-
-
-function TextField() { } TextField.prototype = new Field();
-TextField.prototype.set_disp = function(val) {
- this.disp_area.innerHTML = replace_newlines(val);
-}
-TextField.prototype.make_input = function() {
- var me = this;
-
- if(this.in_grid)
- return; // do nothing, text dialog will take over
-
- this.input = $a(this.input_area, 'textarea');
-
- if(this.df.fieldtype=='Small Text') {
- $(this.input).css({height: "80px"});
- } else if(this.df.width) {
- $(this.input).css({height: cint(this.df.width) + "px"});
- } else {
- $(this.input).css({height: "160px"});
- }
- this.input.set_input = function(v) {
- me.input.value = (v==null ? "" : v);
- me.last_value = v;
- }
- this.input.onchange = function() {
- me.set(me.input.value);
- me.run_trigger();
- }
- this.get_value= function() {
- return this.input.value;
- }
-}
-
-// text dialog
-var text_dialog;
-function make_text_dialog() {
- var d = new Dialog(520,410,'Edit Text');
- d.make_body([
- ['Text', 'Enter Text'],
- ['HTML', 'Description'],
- ['Button', 'Update']
- ]);
- d.widgets['Update'].onclick = function() {
- var t = this.dialog;
- t.field.set(t.widgets['Enter Text'].value);
- t.hide();
- }
- d.onshow = function() {
- this.widgets['Enter Text'].style.height = '300px';
- var v = _f.get_value(this.field.doctype,this.field.docname,this.field.df.fieldname);
- this.widgets['Enter Text'].value = v==null?'':v;
- this.widgets['Enter Text'].focus();
- this.widgets['Description'].innerHTML = ''
- if(this.field.df.description)
- $a(this.widgets['Description'], 'div', 'help small', '', this.field.df.description);
- }
- d.onhide = function() {
- if(_f.cur_grid_cell)
- _f.cur_grid_cell.grid.cell_deselect();
- }
- text_dialog = d;
-}
-
-TextField.prototype.table_refresh = function() {
- if(!this.text_dialog)
- make_text_dialog();
- text_dialog.set_title(wn._('Enter text for')+': "'+ wn._(this.df.label) +'"');
- text_dialog.field = this;
- text_dialog.show();
-}
-
-
-// Select
-// ======================================================================================
-
-function SelectField() { } SelectField.prototype = new Field();
-SelectField.prototype.make_input = function() {
- var me = this;
- var opt=[];
-
- if(this.in_filter && (!this.df.single_select)) {
- // multiple select
- this.input = $a(this.input_area, 'select');
- this.input.multiple = true;
- this.input.style.height = '4em';
- this.input.lab = $a(this.input_area, 'div', {fontSize:'9px',color:'#999'});
- this.input.lab.innerHTML = '(Use Ctrl+Click to select multiple or de-select)'
- } else {
-
- // Single select
- this.input = $a(this.input_area, 'select');
-
- this.input.onchange = function() {
- if(me.validate)
- me.validate();
- me.set(sel_val(this));
- me.run_trigger();
- }
-
- if(this.df.options == 'attach_files:') {
- this.attach_files = true;
- $(this.input).css({"width": "70%"});
- $("")
- .click(function() {
- cur_frm.attachments.new_attachment(me.df.fieldname);
- })
- .appendTo(this.input_area);
- }
- }
-
- // set as single (to be called from report builder)
- this.set_as_single = function() {
- var i = this.input;
- i.multiple = false;
- i.style.height = null;
- if(i.lab)$dh(i.lab)
- }
-
- // refresh options list
- this.refresh_options = function(options) {
- if(options)
- me.df.options = options;
-
- if(this.attach_files)
- this.set_attach_options();
-
- if(typeof me.df.options=="object")
- me.options_list = me.df.options || [""];
- else
- me.options_list = me.df.options?me.df.options.split('\n'):[''];
-
- // add options
- if(me.in_filter && me.options_list[0]!='') {
- me.options_list = add_lists([''], me.options_list);
- }
-
- $(this.input).empty().add_options(me.options_list);
- }
-
- // refresh options
- this.onrefresh = function() {
- this.refresh_options();
-
- if(this.not_in_form) {
- this.input.value = '';
- return;
- }
-
- if(_f.get_value)
- var v = _f.get_value(this.doctype,this.docname,this.df.fieldname);
- else {
- if(this.options_list && this.options_list.length)
- var v = this.options_list[0];
- else
- var v = null;
- }
-
- this.input.set_input(v);
- }
-
- var _set_value = function(value) {
- // use option's value if dict, else use string for comparison and setting
- for(var i in (me.options_list || [""])) {
- var option = me.options_list[i];
- if($.isPlainObject(option)){
- option = option.value;
- }
- if(option === value) {
- me.input.value = value;
- me.last_value = value;
- break;
- }
- }
- }
-
- this.input.set_input=function(v) {
- if(!v) {
- if(!me.input.multiple) {
- if(me.docname) { // if called from onload without docname being set on fields
- _set_value(v);
- me.set(me.get_value());
- }
- }
- } else {
- if(me.options_list) {
- if(me.input.multiple) {
- for(var i=0; i')
- .appendTo(this.input_area)
- .timepicker({
- timeFormat: 'hh:mm:ss',
- }).get(0);
-
- this.input.set_input = function(v) {
- $(me.input).val(v);
- me.last_value = v;
- };
-
- this.input.onchange = function() {
- if(!this.not_in_form)
- me.set(me.input.value);
- me.run_trigger();
- };
-}
-
-function DateTimeField() { } DateTimeField.prototype = new DateField();
-
-DateTimeField.prototype.make_input = function() {
- import_timepicker();
- var me = this;
-
- args = get_datepicker_options();
- args.timeFormat = "hh:mm:ss";
-
- this.input = $('')
- .appendTo(this.input_area)
- .datetimepicker(args).get(0);
-
- this.setup_input();
-}
-
-var tmpid = 0;
-
-_f.ButtonField = function() { };
-_f.ButtonField.prototype = new Field();
-_f.ButtonField.prototype.with_label = 0;
-_f.ButtonField.prototype.make_input = function() { var me = this;
-
- // make a button area for one button
- if(!this.button_area)
- this.button_area = $a(this.input_area, 'div','',{
- marginBottom:'4px'});
-
- // make the input
- this.input = $btn(this.button_area,
- me.df.label, null,
- {fontWeight:'bold'}, null, 1)
-
- $(this.input).click(function() {
- if(me.not_in_form) return;
-
- if(cur_frm.cscript[me.df.fieldname] && (!me.in_filter)) {
- cur_frm.runclientscript(me.df.fieldname, me.doctype, me.docname);
- } else {
- cur_frm.runscript(me.df.options, me);
- }
- });
-}
-
-_f.ButtonField.prototype.hide = function() {
- $dh(this.wrapper);
-};
-
-_f.ButtonField.prototype.show = function() {
- $ds(this.wrapper);
-};
-
-
-_f.ButtonField.prototype.set = function(v) { }; // No Setter
-_f.ButtonField.prototype.set_disp = function(val) { } // No Disp on readonly
-
-function make_field(docfield, doctype, parent, frm, in_grid, hide_label) { // Factory
- return new wn.ui.form.make_control({
- df: docfield,
- doctype: doctype,
- parent: parent,
- hide_label: hide_label,
- frm: frm
- });
-
- switch(docfield.fieldtype.toLowerCase()) {
- // form fields
- case 'code':var f = new _f.CodeField(); break;
- case 'text editor':var f = new _f.CodeField(); break;
- case 'table':var f = new _f.TableField(); break;
- case 'image':var f= new _f.ImageField(); break;
- }
-
- if(!f) console.log(docfield.fieldtype)
-
- f.parent = parent;
- f.doctype = doctype;
- f.df = docfield;
- f.perm = frm ? frm.perm : [[1,1,1]];
- if(_f)
- f.col_break_width = _f.cur_col_break_width;
-
- if(in_grid) {
- f.in_grid = true;
- f.with_label = 0;
- }
- if(hide_label) {
- f.with_label = 0;
- }
- if(frm) {
- f.frm = frm;
- if(parent)
- f.layout_cell = parent.parentNode;
- }
- if(f.init) f.init();
- f.make_body();
- return f;
-}
-
diff --git a/public/js/legacy/widgets/form/form.js b/public/js/legacy/widgets/form/form.js
index 7eecc93aba..78200445f4 100644
--- a/public/js/legacy/widgets/form/form.js
+++ b/public/js/legacy/widgets/form/form.js
@@ -780,7 +780,8 @@ _f.Frm.prototype.disable_save = function() {
// IMPORTANT: this function should be called in refresh event
cur_frm.save_disabled = true;
cur_frm.footer.hide_save();
- cur_frm.appframe.buttons.Save.remove();
+ if(cur_frm.appframe.buttons.Save)
+ cur_frm.appframe.buttons.Save.remove();
delete cur_frm.appframe.buttons.Save
}
diff --git a/public/js/legacy/widgets/form/form_dialog.js b/public/js/legacy/widgets/form/form_dialog.js
deleted file mode 100644
index 2aa2e47e65..0000000000
--- a/public/js/legacy/widgets/form/form_dialog.js
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) 2012 Web Notes Technologies Pvt Ltd (http://erpnext.com)
-//
-// MIT License (MIT)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-// PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-// OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-// FrmDialog - twin of FrmContainer
-// =======================================================================
-_f.frm_dialog = null;
-_f.calling_doc_stack = [];
-_f.temp_access = {};
-
-_f.FrmDialog = function() {
- var me = this;
- this.last_displayed = null;
-
- var d = new Dialog(640, null, 'Edit Row');
- this.body = $a(d.body, 'div', 'dialog_frm');
- d.done_btn_area = $a(d.body, 'div', '', {margin:'8px'});
-
- // done button
- me.on_complete = function() {
-
- if(me.table_form) {
- // table form, just hide the dialog (saving will be done with the parent)
- me.dialog.hide();
- } else {
- // form in dialog, so save it
- var callback = function(r) {
- var dn = cur_frm.docname;
- if(!r.exc) {
- // check if there is another dialog open?
- me.dialog.hide();
- }
-
- // callback
- if(me.on_save_callback)
- me.on_save_callback(dn);
- }
- cur_frm.save('Save', callback);
- }
- }
-
- // set title onshow
- // -------------------------------------------
- d.onshow = function() {
- // set the dialog title
- d.done_btn_area.innerHTML = '';
- d.done_btn = $btn(d.done_btn_area, 'Save', null, null, 'green');
- d.done_btn.onclick = function() { me.on_complete() };
- if(me.table_form) {
- d.set_title("Editing Row #" + (_f.cur_grid_ridx+1));
- d.done_btn.innerHTML = 'Done Editing';
- } else {
- d.set_title(cur_frm.doctype==cur_frm.doctype ? (cur_frm.doctype) : (cur_frm.doctype + ': ' + cur_frm.docname));
- d.done_btn.innerHTML = 'Save';
- }
- }
-
- // on hide, refresh grid or call onsave
- // -------------------------------------------
- d.onhide = function() {
- // if called from grid, refresh the row
- if(_f.cur_grid) {
- _f.cur_grid.refresh_row(_f.cur_grid_ridx, me.dn);
- }
-
- // set the new global cur_frm (if applicable)
- if(wn.container.page.frm) {
- cur_frm = wn.container.page.frm;
- }
-
- // call onhide
- if(me.cur_frm.cscript.hide_dialog) {
- me.cur_frm.cscript.hide_dialog();
- }
-
- // hide the form
- //console.log(me.cur_frm.wrapper);
- $(me.cur_frm.wrapper).toggle(false);
- }
- this.dialog = d;
-}
-
-// called from table edit
-_f.edit_record = function(dt, dn) {
- if(!_f.frm_dialog) {
- _f.frm_dialog = new _f.FrmDialog();
- }
- var d = _f.frm_dialog;
-
- wn.model.with_doctype(dt, function() {
- wn.model.with_doc(dt, dn, function(dn) {
- // load
- if(!_f.frms[dt]) {
- _f.frms[dt] = new _f.Frm(dt, d.body);
- }
- var f = _f.frms[dt];
- if(f.meta.istable) {
- f.parent_doctype = cur_frm.doctype;
- f.parent_docname = cur_frm.docname;
- }
-
- d.cur_frm = f;
- d.dn = dn;
- d.table_form = f.meta.istable;
-
- d.dialog.show();
-
- // show the form
- f.refresh(dn);
-
- $(f.wrapper).removeClass('layout-wrapper')
- .removeClass('layout-wrapper-background').toggle(true);
- })
- })
-}
\ No newline at end of file
diff --git a/public/js/legacy/widgets/form/form_fields.js b/public/js/legacy/widgets/form/form_fields.js
deleted file mode 100644
index 5236060d94..0000000000
--- a/public/js/legacy/widgets/form/form_fields.js
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) 2012 Web Notes Technologies Pvt Ltd (http://erpnext.com)
-//
-// MIT License (MIT)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-// PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-// OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-// Image field definition
-// ======================================================================================
-
-_f.ImageField = function() { this.images = {}; }
-_f.ImageField.prototype = new Field();
-_f.ImageField.prototype.onrefresh = function() {
- $(this.label_span).toggle(false);
- $(this.wrapper).find("img").remove();
- if(this.df.options && this.frm.doc[this.df.options]) {
- $("![]("+wn.utils.get_file_link(this.frm.doc[this.df.options])+")
")
- .appendTo($(this.wrapper).empty());
- } else {
- $("
\ - %(info)s', - item)) - .appendTo(ul); - }; - - $(this.txt).change(function() { - var val = $(this).val();//me.get_value(); - - me.set_input_value_executed = false; - - if(!val) { - if(selector && selector.display) - return; - me.set_input_value(''); - } else { - // SetTimeout hack! if in put is set via autocomplete, do not validate twice - setTimeout(function() { - if (!me.set_input_value_executed) { - me.set_input_value(val); - } - }, 1000); - } - }) -} - -LinkField.prototype.get_custom_query = function() { - this.set_get_query(); - if(this.get_query) { - if(cur_frm) - var doc = locals[cur_frm.doctype][cur_frm.docname]; - return this.get_query(doc, this.doctype, this.docname); - } -} - -LinkField.prototype.setup_buttons = function() { - var me = this; - - // magnifier - search - me.btn.onclick = function() { - selector.set(me, me.df.options, me.df.label); - selector.show(me.txt); - } - - // open - if(me.btn1)me.btn1.onclick = function() { - if(me.txt.value && me.df.options) { loaddoc(me.df.options, me.txt.value); } - } - // add button - for inline creation of records - me.can_create = 0; - if((!me.not_in_form) && in_list(profile.can_create, me.df.options)) { - me.can_create = 1; - me.btn2.onclick = function() { - var on_save_callback = function(new_rec) { - if(new_rec) { - var d = _f.calling_doc_stack.pop(); // patch for composites - - locals[d[0]][d[1]][me.df.fieldname] = new_rec; - me.refresh(); - - if(me.grid)me.grid.refresh(); - - // call script - me.run_trigger(); - } - } - _f.calling_doc_stack.push([me.doctype, me.docname]); - new_doc(me.df.options); - } - } else { - $(me.btn2).remove(); - } -} - -LinkField.prototype.set_input_value = function(val) { - var me = this; - - // SetTimeout hack! if in put is set via autocomplete, do not validate twice - me.set_input_value_executed = true; - - var from_selector = false; - if(selector && selector.display) from_selector = true; - - // refresh mandatory style - me.refresh_label_icon(); - - // not in form, do nothing - if(me.not_in_form) { - $(this.txt).val(val); - return; - } - - // same value, do nothing - if(cur_frm) { - if(val == locals[me.doctype][me.docname][me.df.fieldname]) { - //me.set(val); // one more time, grid bug? - me.run_trigger(); // wanted - called as refresh? - return; - } - } - - // set in locals - me.set(val); - - // deselect cell if in grid - if(_f.cur_grid_cell) - _f.cur_grid_cell.grid.cell_deselect(); - - if(val) { - // validate only if val is not empty - me.validate_link(val, from_selector); - } else { - // run trigger if value is cleared - me.run_trigger(); - } -} - -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(', '); - - $c('webnotes.widgets.form.utils.validate_link', { - 'value':val, - 'options':me.df.options, - 'fetch': fetch - }, - function(r,rt) { - if(r.message=='Ok') { - // set fetch values - if($(me.txt).val()!=val) { - if((me.grid && !from_selector) || (!me.grid)) { - $(me.txt).val(val); - } - } - - if(r.fetch_values) - me.set_fetch_values(r.fetch_values); - - me.run_trigger(); - } else { - me.txt.value = ''; - me.set(''); - } - } - ); -} - -LinkField.prototype.set_fetch_values = function(fetch_values) { - var fl = cur_frm.fetch_dict[this.df.fieldname].fields; - var changed_fields = []; - for(var i=0; i< fl.length; i++) { - if(locals[this.doctype][this.docname][fl[i]]!=fetch_values[i]) { - locals[this.doctype][this.docname][fl[i]] = fetch_values[i]; - if(!this.grid) { - refresh_field(fl[i]); - - // call trigger on the target field - changed_fields.push(fl[i]); - } - } - } - - // run triggers - for(i=0; i
")
- .appendTo($(this.wrapper).empty())
- }
-}
-
-_f.ImageField.prototype.set_disp = function (val) { }
-_f.ImageField.prototype.set = function (val) { }
-
-// Table
-// ======================================================================================
-
-_f.TableField = function() { };
-_f.TableField.prototype = new Field();
-_f.TableField.prototype.with_label = 0;
-_f.TableField.prototype.make_body = function() {
- if(this.perm[this.df.permlevel] && this.perm[this.df.permlevel][READ]) {
- this.wrapper = $("
").appendTo(this.parent).get(0);
- this.grid = new wn.ui.form.Grid({
- frm: this.frm,
- df: this.df,
- perm: this.perm,
- parent: $("
").appendTo(this.wrapper)
- })
- if(this.frm)
- this.frm.grids[this.frm.grids.length] = this;
-
- // description
- if(this.df.description) {
- $('s "%(created_by)s")
\
- \
- s "%(modified_by)s")
', {
- created_by: wn.user_info(doc.owner).fullname,
- avatar_created: wn.utils.get_file_link(wn.user_info(doc.owner).image),
- modified_by: wn.user_info(doc.modified_by).fullname,
- avatar_modified: wn.utils.get_file_link(wn.user_info(doc.modified_by).image),
- })).insertAfter(this.$w.find(".appframe-title"));
-
- this.$w.find(".avatar:eq(0)").popover({
- trigger:"hover",
- title: wn._("Created By"),
- content: wn.user_info(this.frm.doc.owner).fullname
- +" on "+ dateutil.str_to_user(this.frm.doc.creation)
- });
-
- this.$w.find(".avatar:eq(1)").popover({
- trigger:"hover",
- title: wn._("Modified By"),
- content: wn.user_info(this.frm.doc.modified_by).fullname
- +" on "+ dateutil.str_to_user(this.frm.doc.modified)
- });
-
- this.$w.find('.avatar img').centerImage();
- },
- hide_close: function() {
- this.$w.find('.close').toggle(false);
- }
-})
diff --git a/public/js/wn/model/model.js b/public/js/wn/model/model.js
index 3b5336980e..72ecf1cdef 100644
--- a/public/js/wn/model/model.js
+++ b/public/js/wn/model/model.js
@@ -195,6 +195,7 @@ $.extend(wn.model, {
set_value: function(doctype, name, fieldname, value, fieldtype) {
/* help: Set a value locally (if changed) and execute triggers */
+ if(!name) name = doctype;
var doc = locals[doctype] && locals[doctype][name] || null;
if(doc && doc[fieldname] !== value) {
doc[fieldname] = value;
diff --git a/public/js/wn/router.js b/public/js/wn/router.js
index de0e4b1483..244f087e4d 100644
--- a/public/js/wn/router.js
+++ b/public/js/wn/router.js
@@ -65,7 +65,14 @@ wn.get_route_str = function(route) {
}
wn.set_route = function() {
- route = $.map(arguments, function(a) { return a ? encodeURIComponent(a) : null; }).join('/');
+ route = $.map(arguments, function(a) {
+ if($.isPlainObject(a)) {
+ wn.route_options = a;
+ return null;
+ } else {
+ return a ? encodeURIComponent(a) : null;
+ }
+ }).join('/');
window.location.hash = route;
diff --git a/public/js/wn/views/doclistview.js b/public/js/wn/views/doclistview.js
index 139c294ca7..861e538165 100644
--- a/public/js/wn/views/doclistview.js
+++ b/public/js/wn/views/doclistview.js
@@ -237,6 +237,21 @@ wn.views.DocListView = wn.ui.Listing.extend({
checks.attr('checked', $(checks.get(0)).attr('checked') ? false : "checked");
}, 'icon-ok');
}
+ if(in_list(user_roles, "System Manager")) {
+ var meta = locals.DocType[this.doctype];
+ if(meta.allow_import || meta.document_type==="Master") {
+ this.add_button(wn._("Import"), function() {
+ wn.set_route("data-import-tool", {
+ doctype: me.doctype
+ })
+ }, "icon-upload")
+ };
+ this.add_button(wn._("Customize"), function() {
+ wn.set_route("Form", "Customize Form", {
+ doctype: me.doctype
+ })
+ }, "icon-glass");
+ }
},
get_checked_items: function() {
return $.map(this.$page.find('.list-delete:checked'), function(e) {
diff --git a/webnotes/model/bean.py b/webnotes/model/bean.py
index d194d28b3c..451d1c7e33 100644
--- a/webnotes/model/bean.py
+++ b/webnotes/model/bean.py
@@ -82,6 +82,12 @@ class Bean:
def __iter__(self):
return self.doclist.__iter__()
+ @property
+ def meta(self):
+ if not hasattr(self, "_meta"):
+ self._meta = webnotes.get_doctype(self.doc.doctype)
+ return self._meta
+
def from_compressed(self, data, docname):
from webnotes.model.utils import expand
self.set_doclist(expand(data))
@@ -205,9 +211,12 @@ class Bean:
def update_parent_info(self):
idx_map = {}
is_local = cint(self.doc.fields.get("__islocal"))
-
+ parentfields = [d.fieldname for d in self.meta.get({"doctype": "DocField", "fieldtype": "Table"})]
for i, d in enumerate(self.doclist[1:]):
if d.parentfield:
+ if not d.parentfield in parentfields:
+ webnotes.msgprint("Bad parentfield %s" % parentfield,
+ raise_exception=True)
d.parenttype = self.doc.doctype
d.parent = self.doc.name
if not d.idx:
@@ -277,7 +286,7 @@ class Bean:
self.doc.fields["__islocal"] = 1
if webnotes.in_test:
- if webnotes.get_doctype(self.doc.doctype).get_field("naming_series"):
+ if self.meta.get_field("naming_series"):
self.doc.naming_series = "_T-" + self.doc.doctype + "-"
return self.save()
@@ -358,25 +367,25 @@ class Bean:
def check_mandatory(self):
missing = []
- from webnotes.model.meta import get_mandatory_fields
for doc in self.doclist:
- for fieldname, label, fieldtype in get_mandatory_fields(doc.doctype):
- msg = ""
- if fieldtype == "Table":
- if not self.doclist.get({"parentfield": fieldname}):
- msg = _("Error") + ": " + _("Data missing in table") + ": " + _(label)
+ for df in self.meta:
+ if df.doctype=="DocField" and df.reqd and df.parent==doc.doctype:
+ msg = ""
+ if df.fieldtype == "Table":
+ if not self.doclist.get({"parentfield": df.fieldname}):
+ msg = _("Error") + ": " + _("Data missing in table") + ": " + _(label)
- elif doc.fields.get(fieldname) is None:
- msg = _("Error") + ": "
- if doc.parentfield:
- msg += _("Row") + (" # %d: " % doc.idx)
+ elif doc.fields.get(df.fieldname) is None:
+ msg = _("Error") + ": "
+ if doc.parentfield:
+ msg += _("Row") + (" # %d: " % doc.idx)
- msg += _("Value missing for") + ": " + _(label)
+ msg += _("Value missing for") + ": " + _(df.label)
- if msg:
- missing.append([msg, fieldname])
+ if msg:
+ missing.append([msg, df.fieldname])
- if missing:
+ if missing:
for msg, fieldname in missing:
msgprint(msg)
diff --git a/webnotes/model/doc.py b/webnotes/model/doc.py
index f823100ccb..1493b96298 100755
--- a/webnotes/model/doc.py
+++ b/webnotes/model/doc.py
@@ -392,7 +392,7 @@ class Document:
# add missing parentinfo (if reqd)
if self.parent and not (self.parenttype and self.parentfield):
self.update_parentinfo()
-
+
if self.parent and not self.idx:
self.set_idx()
diff --git a/webnotes/model/meta.py b/webnotes/model/meta.py
index ce481018d7..f76f0a6a70 100644
--- a/webnotes/model/meta.py
+++ b/webnotes/model/meta.py
@@ -112,16 +112,4 @@ def get_field_precision(df, doc):
decimal_str, comma_str, precision = get_number_format_info(number_format or \
webnotes.conn.get_default("number_format") or "#,###.##")
- return precision
-
-doctype_mandatory_fields = {}
-def get_mandatory_fields(doctype, parenttype=None):
- if not doctype_mandatory_fields.get(doctype):
- doctype_mandatory_fields[doctype] = []
-
- meta = webnotes.get_doctype(parenttype or doctype)
- for df in meta.get({"doctype": "DocField", "parent": doctype}):
- if cint(df.reqd):
- doctype_mandatory_fields[doctype].append((df.fieldname, df.label, df.fieldtype))
-
- return doctype_mandatory_fields[doctype]
\ No newline at end of file
+ return precision
\ No newline at end of file
diff --git a/webnotes/test_runner.py b/webnotes/test_runner.py
index 05215ecec3..49024c82e2 100644
--- a/webnotes/test_runner.py
+++ b/webnotes/test_runner.py
@@ -173,7 +173,7 @@ def _run_test(path, filename, verbose):
test_suite.addTest(unittest.TestLoader().loadTestsFromModule(module))
unittest.TextTestRunner(verbosity=1+(verbose and 1 or 0)).run(test_suite)
-if __name__=="__main__":
+def main():
import argparse
parser = argparse.ArgumentParser(description='Run tests.')
@@ -208,4 +208,7 @@ if __name__=="__main__":
make_test_records(doctype, verbose=args.verbose)
test_suite.addTest(unittest.TestLoader().loadTestsFromModule(sys.modules[args.module]))
- unittest.TextTestRunner(verbosity=1+(args.verbose and 1 or 0)).run(test_suite)
\ No newline at end of file
+ unittest.TextTestRunner(verbosity=1+(args.verbose and 1 or 0)).run(test_suite)
+
+if __name__=="__main__":
+ main()
\ No newline at end of file
diff --git a/wnf.py b/wnf.py
index 4c0eabf7d4..5bed63a322 100755
--- a/wnf.py
+++ b/wnf.py
@@ -245,8 +245,7 @@ def setup_options():
parser.add_option("--append_future_import", default=False, action="store_true",
help="append from __future__ import unicode literals to py files")
- parser.add_option("--test", help="Run test", metavar="MODULE",
- nargs=1)
+ parser.add_option("--test", help="Run test", action="store_true", default=False)
parser.add_option("--build_message_files", default=False, action="store_true",
help="Build message files for translation")
@@ -461,13 +460,10 @@ def run():
print '\n'.join(webnotes.message_log)
if options.test is not None:
- module_name = options.test
- import unittest
-
del sys.argv[1:]
- # is there a better way?
- exec ('from %s import *' % module_name) in globals()
- unittest.main()
+
+ import webnotes.test_runner
+ webnotes.test_runner.main()
elif options.build_message_files:
import webnotes.translate
' + this.df.description + '
') - .appendTo(this.wrapper); - } - } -} - -_f.TableField.prototype.refresh = function() { - if(!this.grid)return; - - // hide / show grid - var st = this.get_status(); - - if(!this.df['default']) - this.df['default']=''; - - this.grid.can_add_rows = false; - this.grid.can_edit = false; - - if(st=='Write') { - this.grid.can_edit = true; - if(this.df['default'].toLowerCase()!='no toolbar') - this.grid.can_add_rows = true; - - if(this.df['default'].toLowerCase()=='no add rows') { - this.grid.can_add_rows = false; - } - } - - $(this.wrapper).toggle(st=='Write' || st=="Read"); - this.grid.refresh(); -} - -_f.TableField.prototype.set = function(v) { }; // nothing -_f.TableField.prototype.set_input = function(v) { }; // nothing - - -_f.CodeField = function() { }; -_f.CodeField.prototype = new Field(); -_f.CodeField.prototype.make_input = function() { - var me = this; - - this.label_span.innerHTML = this.df.label; - - $(this.input_area).css({"min-height":"360px"}); - - if(this.df.fieldtype=='Text Editor') { - this.input = new wn.editors.BootstrapWYSIWYG({ - parent: this.input_area, - change: function(value) { - me.set_value_and_run_trigger(value); - }, - field: this - }); - } else { - this.input = new wn.editors.ACE({ - parent: this.input_area, - change: function(value) { - me.set_value_and_run_trigger(value); - }, - field: this - }); - } - this.get_value = function() { - return this.input.get_value(); - } -} - -_f.CodeField.prototype.set_value_and_run_trigger = function(value) { - if(locals[cur_frm.doctype][cur_frm.docname][this.df.fieldname] != value) { - this.set(value); - this.changing_value = true; - this.run_trigger(); - this.changing_value = false; - } -} - -_f.CodeField.prototype.set_disp = function(val) { - $y(this.disp_area, {width:'90%'}) - if(this.df.fieldtype=='Text Editor') { - this.disp_area.innerHTML = val; - } else { - this.disp_area.innerHTML = ''; - } -} diff --git a/public/js/legacy/widgets/form/form_header.js b/public/js/legacy/widgets/form/form_header.js deleted file mode 100644 index 9fed221fef..0000000000 --- a/public/js/legacy/widgets/form/form_header.js +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright (c) 2012 Web Notes Technologies Pvt Ltd (http://erpnext.com) -// -// MIT License (MIT) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -// PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -// OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -// features -// -------- -// toolbar - standard and custom -// label - saved, submitted etc -// save / submit button toggle based on "saved" or not -// highlight and fade name based on refresh - -_f.FrmHeader = Class.extend({ - init: function(parent, frm) { - this.appframe = frm.appframe; - this.$w = this.appframe.$w; - this.frm = frm; - - this.appframe.add_home_breadcrumb(); - this.appframe.add_module_icon(frm.meta.module) - this.appframe.set_views_for(frm.meta.name, "form"); - - if(!frm.meta.issingle) { - if(frm.cscript.add_list_breadcrumb) { - frm.cscript.add_list_breadcrumb(this.appframe); - } else { - this.appframe.add_list_breadcrumb(frm.meta.name); - } - } - this.appframe.add_breadcrumb("icon-file"); - }, - refresh: function() { - var me = this; - var title = this.frm.docname; - if(title.length > 30) { - title = title.substr(0,30) + "..."; - } - this.appframe.set_title(title, wn._(this.frm.docname)); - this.appframe.set_sub_title(this.frm.doc.__islocal ? "Not Saved" - : "Last Updated on " + dateutil.str_to_user(this.frm.doc.modified) + " by " + this.frm.doc.modified_by) - //this.refresh_timestamps(); - }, - refresh_timestamps: function() { - this.$w.find(".avatar").remove(); - - var doc = this.frm.doc; - if(doc.__islocal || !doc.owner || !doc.modified_by) - return; - - $(repl('\ -