cleaned up pages and minor style fixes, removed submit_error in js
This commit is contained in:
Rushabh Mehta
parent
9f05863423
commit
becfd56e07
17 changed files with 112 additions and 52 deletions
|
|
@ -40,7 +40,13 @@ select, input, textarea {
|
|||
color: #222;
|
||||
}
|
||||
|
||||
textarea { font-family: arial, helvetica, sans serif; height: 120px; width: 90%; overflow-x: auto; font-size: 12px; }
|
||||
textarea {
|
||||
font-family: inherit;
|
||||
height: 120px;
|
||||
width: 90%;
|
||||
font-size: 12px;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
table { padding: 0px; border-collapse: 'collapse'}
|
||||
|
||||
|
|
@ -63,6 +69,7 @@ div#body_div {
|
|||
position: relative;
|
||||
display: none;
|
||||
margin-top: 56px;
|
||||
padding-right: 7px;
|
||||
}
|
||||
|
||||
div.no_script {
|
||||
|
|
|
|||
|
|
@ -44,7 +44,13 @@ select, input, textarea {
|
|||
color: #222;
|
||||
}
|
||||
|
||||
textarea { font-family: arial, helvetica, sans serif; height: 120px; width: 90%; overflow-x: auto; font-size: 12px; }
|
||||
textarea {
|
||||
font-family: inherit;
|
||||
height: 120px;
|
||||
width: 90%;
|
||||
font-size: 12px;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
table { padding: 0px; border-collapse: 'collapse'}
|
||||
|
||||
|
|
@ -67,6 +73,7 @@ div#body_div {
|
|||
position: relative;
|
||||
display: none;
|
||||
margin-top: 56px;
|
||||
padding-right: 7px;
|
||||
}
|
||||
|
||||
div.no_script {
|
||||
|
|
@ -1829,4 +1836,5 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|||
-moz-opacity: 0.4;
|
||||
opacity: 0.4;
|
||||
cursor: pointer;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -176,8 +176,8 @@ _f.Frm.prototype.runscript=function(scriptname,callingfield,onrefresh){var me=th
|
|||
onrefresh(r,rtxt);me.refresh_fields();me.refresh_dependency();if(callingfield)callingfield.input.done_working();});}}
|
||||
_f.Frm.prototype.runclientscript=function(caller,cdt,cdn){var _dt=this.parent_doctype?this.parent_doctype:this.doctype;var _dn=this.parent_docname?this.parent_docname:this.docname;var doc=get_local(_dt,_dn);if(!cdt)cdt=this.doctype;if(!cdn)cdn=this.docname;var ret=null;try{if(this.cscript[caller])
|
||||
ret=this.cscript[caller](doc,cdt,cdn);if(this.cscript['custom_'+caller])
|
||||
ret+=this.cscript['custom_'+caller](doc,cdt,cdn);}catch(e){submit_error(e);}
|
||||
if(caller&&caller.toLowerCase()=='setup'){var doctype=get_local('DocType',this.doctype);var cs=doctype.__js||(doctype.client_script_core+doctype.client_script);if(cs){try{var tmp=eval(cs);}catch(e){submit_error(e);}}
|
||||
ret+=this.cscript['custom_'+caller](doc,cdt,cdn);}catch(e){console.log(e);}
|
||||
if(caller&&caller.toLowerCase()=='setup'){var doctype=get_local('DocType',this.doctype);var cs=doctype.__js||(doctype.client_script_core+doctype.client_script);if(cs){try{var tmp=eval(cs);}catch(e){console.log(e);}}
|
||||
if(doctype.__css)set_style(doctype.__css)
|
||||
if(doctype.client_string){this.cstring={};var elist=doctype.client_string.split('---');for(var i=1;i<elist.length;i=i+2){this.cstring[strip(elist[i])]=elist[i+1];}}}
|
||||
return ret;}
|
||||
|
|
@ -261,7 +261,7 @@ if(this.df['default'].toLowerCase()=='no add rows'){this.grid.can_add_rows=false
|
|||
if(this.old_status!=st){if(st=='Write'){this.grid.show();}else if(st=='Read'){this.grid.show();}else{this.grid.hide();}
|
||||
this.old_status=st;}
|
||||
this.grid.refresh();}
|
||||
_f.TableField.prototype.set=function(v){};_f.TableField.prototype.set_input=function(v){};_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=$a(this.input_area,'textarea','code_text',{fontSize:'12px'});this.myid=wn.dom.set_unique_id(this.input);this.input.setAttribute('wrap','off');this.input.set_input=function(v){if(me.editor){me.editor.setContent(v);}else{me.input.value=v;me.input.innerHTML=v;}}
|
||||
_f.TableField.prototype.set=function(v){};_f.TableField.prototype.set_input=function(v){};_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=$a(this.input_area,'textarea','code_text',{fontSize:'12px'});this.myid=wn.dom.set_unique_id(this.input);this.input.set_input=function(v){if(me.editor){me.editor.setContent(v);}else{me.input.value=v;me.input.innerHTML=v;}}
|
||||
this.input.onchange=function(){if(me.editor){}else{me.set(me.input.value);}
|
||||
me.run_trigger();}
|
||||
this.get_value=function(){if(me.editor){return me.editor.getContent();}else{return this.input.value;}}
|
||||
|
|
@ -570,4 +570,4 @@ this.refresh();},refresh:function(){var me=this;$c('webnotes.widgets.form.assign
|
|||
for(var i=0;i<d.length;i++){$(this.body).append(repl('<div>%(owner)s \
|
||||
<a class="close" href="#" data-owner="%(owner)s">×</a></div>',d[i]))}
|
||||
$(this.body).find('a.close').click(function(){$c('webnotes.widgets.form.assign_to.remove',{doctype:me.doctype,name:me.name,assign_to:$(this).attr('data-owner')},function(r,rt){me.render(r.message);});return false;});},add:function(){var me=this;if(!me.dialog){me.dialog=new wn.widgets.Dialog({title:'Add to To Do',width:350,fields:[{fieldtype:'Link',fieldname:'assign_to',options:'Profile',label:'Assign To',description:'Add to To Do List of',reqd:true},{fieldtype:'Data',fieldname:'description',label:'Comment','default':'Assigned by '+user},{fieldtype:'Date',fieldname:'date',label:'Complete By'},{fieldtype:'Select',fieldname:'priority',label:'Priority',options:'Low\nMedium\nHigh','default':'Medium'},{fieldtype:'Button',label:'Add',fieldname:'add_btn'}]});me.dialog.fields_dict.add_btn.input.onclick=function(){var assign_to=me.dialog.fields_dict.assign_to.get_value();if(assign_to){$c('webnotes.widgets.form.assign_to.add',{doctype:me.doctype,name:me.name,assign_to:assign_to,description:me.dialog.fields_dict.description.get_value(),priority:me.dialog.fields_dict.priority.get_value(),date:me.dialog.fields_dict.date.get_value()},function(r,rt){me.render(r.message);});}}}
|
||||
me.dialog.clear();me.dialog.show();}});
|
||||
me.dialog.clear();me.dialog.show();}});
|
||||
|
|
@ -7,15 +7,6 @@ function errprint(t) {
|
|||
err_list[err_list.length] = ('<pre style="font-family: Courier, Fixed; font-size: 11px; border-bottom: 1px solid #AAA; overflow: auto; width: 90%;">'+t+'</pre>');
|
||||
}
|
||||
|
||||
function submit_error(e) {
|
||||
if(isIE) {
|
||||
var t = 'Explorer: ' + e + '\n' + e.description;
|
||||
} else {
|
||||
var t = 'Mozilla: ' + e.toString() + '\n' + e.message + '\nLine Number:' + e.lineNumber;// + '\nStack:' + e.stack;
|
||||
}
|
||||
errprint(e + '\nLine Number:' + e.lineNumber + '\nStack:' + e.stack);
|
||||
}
|
||||
|
||||
function setup_err_console() {
|
||||
err_console = new Dialog(640, 480, 'Error Console')
|
||||
err_console.make_body([
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ function loadpage(page_name, call_back, no_history) {
|
|||
try {
|
||||
if(pscript['refresh_'+page_name]) pscript['refresh_'+page_name](); // onload
|
||||
} catch(e) {
|
||||
submit_error(e);
|
||||
console.log(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,12 +9,14 @@ function Page(page_name, content) {
|
|||
|
||||
this.onshow = function() {
|
||||
// default set_title
|
||||
set_title(me.doc.page_title ? me.doc.page_title : me.name);
|
||||
set_title(me.doc.title ? me.doc.title : me.name);
|
||||
|
||||
// onshow
|
||||
try {
|
||||
if(pscript['onshow_'+me.name]) pscript['onshow_'+me.name](); // onload
|
||||
} catch(e) { submit_error(e); }
|
||||
if(pscript['onshow_'+me.name]) pscript['onshow_'+me.name](me.wrapper); // onload
|
||||
} catch(e) {
|
||||
console.log(e);
|
||||
}
|
||||
|
||||
// clear cur_frm
|
||||
cur_frm = null;
|
||||
|
|
@ -69,7 +71,7 @@ function render_page(page_name, menuitem) {
|
|||
if(pscript['onload_'+page_name])
|
||||
pscript['onload_'+page_name](page_body.pages[page_name]); // onload
|
||||
} catch(e) {
|
||||
submit_error(e);
|
||||
console.log(e);
|
||||
}
|
||||
|
||||
return p;
|
||||
|
|
|
|||
|
|
@ -853,7 +853,6 @@ TextField.prototype.make_input = function() {
|
|||
return; // do nothing, text dialog will take over
|
||||
|
||||
this.input = $a(this.input_area, 'textarea');
|
||||
this.input.wrap = 'off';
|
||||
if(this.df.fieldtype=='Small Text')
|
||||
this.input.style.height = "80px";
|
||||
this.input.set_input = function(v) {
|
||||
|
|
|
|||
|
|
@ -979,7 +979,7 @@ _f.Frm.prototype.runclientscript = function(caller, cdt, cdn) {
|
|||
if(this.cscript['custom_'+caller])
|
||||
ret += this.cscript['custom_'+caller](doc, cdt, cdn);
|
||||
} catch(e) {
|
||||
submit_error(e);
|
||||
console.log(e);
|
||||
}
|
||||
|
||||
if(caller && caller.toLowerCase()=='setup') {
|
||||
|
|
@ -992,7 +992,7 @@ _f.Frm.prototype.runclientscript = function(caller, cdt, cdn) {
|
|||
try {
|
||||
var tmp = eval(cs);
|
||||
} catch(e) {
|
||||
submit_error(e);
|
||||
console.log(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -335,7 +335,6 @@ _f.CodeField.prototype.make_input = function() {
|
|||
this.input = $a(this.input_area, 'textarea','code_text',{fontSize:'12px'});
|
||||
this.myid = wn.dom.set_unique_id(this.input);
|
||||
|
||||
this.input.setAttribute('wrap', 'off');
|
||||
this.input.set_input = function(v) {
|
||||
if(me.editor) {
|
||||
me.editor.setContent(v);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,19 @@
|
|||
// uses FieldGroup for rendering filters
|
||||
// removed rarely used functionality
|
||||
//
|
||||
// opts:
|
||||
// parent
|
||||
// query or get_query
|
||||
// query_max
|
||||
// no_result_message ("No result")
|
||||
// page_length (20)
|
||||
// filters ([{docfield}, ..])
|
||||
// hide_refresh (False)
|
||||
// new_doctype
|
||||
// [function] render_row(parent, data)
|
||||
// [function] onrun
|
||||
// no_loading (no ajax indicator)
|
||||
|
||||
|
||||
wn.widgets.Listing = function(opts) {
|
||||
this.opts = opts;
|
||||
|
|
@ -63,7 +76,7 @@ wn.widgets.Listing = function(opts) {
|
|||
// make more button
|
||||
// that shows more results when they are displayed
|
||||
this.make_more_button = function() {
|
||||
this.more_btn = $btn(this.more_button_area, 'Show more results...',
|
||||
this.more_btn = $btn(this.more_button_area, 'More...',
|
||||
function() {
|
||||
me.more_btn.set_working();
|
||||
me.run(function() {
|
||||
|
|
@ -137,14 +150,13 @@ wn.widgets.Listing = function(opts) {
|
|||
this.start = 0;
|
||||
|
||||
// load query
|
||||
this.query = this.opts.get_query();
|
||||
this.query = this.opts.get_query ? this.opts.get_query() : this.opts.query;
|
||||
this.add_limits();
|
||||
|
||||
args={ query_max: this.query_max ? this.query_max : '' }
|
||||
args={ query_max: this.query_max || this.opts.query_max || '' }
|
||||
args.simple_query = this.query;
|
||||
|
||||
if(this.opts.as_dict) args.as_dict = 1;
|
||||
if(this.opts.formatted) args.formatted = 1;
|
||||
args.as_dict = 1;
|
||||
|
||||
// show loading
|
||||
if(this.loading_img) $di(this.loading_img);
|
||||
|
|
@ -152,6 +164,8 @@ wn.widgets.Listing = function(opts) {
|
|||
function(r, rt) { me.make_results(r, rt) }, null, this.opts.no_loading);
|
||||
}
|
||||
|
||||
this.refresh = this.run;
|
||||
|
||||
this.add_limits = function() {
|
||||
this.query += ' LIMIT ' + this.start + ',' + (this.page_length+1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -490,7 +490,7 @@ this.make_filters=function(){if(this.opts.filters){$ds(this.filters_area);this.f
|
|||
this.make_toolbar=function(){if(!this.opts.hide_refresh){this.ref_img=$a(this.toolbar_area,'span','link_type',{color:'#888'},'[refresh]');this.ref_img.onclick=function(){me.run();}
|
||||
this.loading_img=$a(this.toolbar_area,'img','lib/images/ui/button-load.gif',{display:'none',marginLeft:'3px',marginBottom:'-2px'});}
|
||||
if(this.opts.new_doctype){this.new_btn=$btn(this.toolbar_area,'New '+get_doctype_label(this.opts.new_doctype),function(){newdoc(me.opts.new_doctype,me.opts.new_doc_onload,me.opts.new_doc_indialog,me.opts.new_doc_onsave);},{marginLeft:'7px'});}}
|
||||
this.make_more_button=function(){this.more_btn=$btn(this.more_button_area,'Show more results...',function(){me.more_btn.set_working();me.run(function(){me.more_btn.done_working();},1);},{fontSize:'14px'},0,1);$y(this.more_btn.loading_img,{marginBottom:'0px'});}
|
||||
this.make_more_button=function(){this.more_btn=$btn(this.more_button_area,'More...',function(){me.more_btn.set_working();me.run(function(){me.more_btn.done_working();},1);},{fontSize:'14px'},0,1);$y(this.more_btn.loading_img,{marginBottom:'0px'});}
|
||||
this.clear=function(){this.results_area.innerHTML='';this.table=null;$ds(this.results_area);$dh(this.no_results_area);}
|
||||
this.make_results=function(r,rt){if(this.start==0)this.clear();$dh(this.more_button_area);if(this.loading_img)$dh(this.loading_img)
|
||||
if(r.values&&r.values.length){this.values=r.values;var m=Math.min(r.values.length,this.page_length);for(var i=0;i<m;i++){var row=this.add_row();this.opts.render_row(row,r.values[i],this,i);}
|
||||
|
|
@ -499,9 +499,9 @@ if(this.onrun)this.onrun();if(this.opts.onrun)this.opts.onrun();}
|
|||
this.add_row=function(){return $a(this.results_area,'div','',(opts.cell_style?opts.cell_style:{padding:'3px'}));}
|
||||
this.run=function(callback,append){if(callback)
|
||||
this.onrun=callback;if(!append)
|
||||
this.start=0;this.query=this.opts.get_query();this.add_limits();args={query_max:this.query_max?this.query_max:''}
|
||||
args.simple_query=this.query;if(this.opts.as_dict)args.as_dict=1;if(this.opts.formatted)args.formatted=1;if(this.loading_img)$di(this.loading_img);$c('webnotes.widgets.query_builder.runquery',args,function(r,rt){me.make_results(r,rt)},null,this.opts.no_loading);}
|
||||
this.add_limits=function(){this.query+=' LIMIT '+this.start+','+(this.page_length+1);}
|
||||
this.start=0;this.query=this.opts.get_query?this.opts.get_query():this.opts.query;this.add_limits();args={query_max:this.query_max||this.opts.query_max||''}
|
||||
args.simple_query=this.query;args.as_dict=1;if(this.loading_img)$di(this.loading_img);$c('webnotes.widgets.query_builder.runquery',args,function(r,rt){me.make_results(r,rt)},null,this.opts.no_loading);}
|
||||
this.refresh=this.run;this.add_limits=function(){this.query+=' LIMIT '+this.start+','+(this.page_length+1);}
|
||||
if(opts)this.make();}
|
||||
/*
|
||||
* lib/js/legacy/widgets/tree.js
|
||||
|
|
@ -756,8 +756,6 @@ $dh(dialog_message);if(!fcount)return;fcount--;if(!fcount){$dh(dialog_back);froz
|
|||
*/
|
||||
|
||||
var err_console;var err_list=[];function errprint(t){err_list[err_list.length]=('<pre style="font-family: Courier, Fixed; font-size: 11px; border-bottom: 1px solid #AAA; overflow: auto; width: 90%;">'+t+'</pre>');}
|
||||
function submit_error(e){if(isIE){var t='Explorer: '+e+'\n'+e.description;}else{var t='Mozilla: '+e.toString()+'\n'+e.message+'\nLine Number:'+e.lineNumber;}
|
||||
errprint(e+'\nLine Number:'+e.lineNumber+'\nStack:'+e.stack);}
|
||||
function setup_err_console(){err_console=new Dialog(640,480,'Error Console')
|
||||
err_console.make_body([['HTML','Error List'],['Button','Clear'],['HTML','Error Report']]);var span=$a(err_console.widgets['Error Report'],'span','link_type');span.innerHTML='Send Error Report';span.onclick=function(){msg=prompt('How / where did you get the error [optional]')
|
||||
var call_back=function(r,rt){err_console.hide();msgprint("Error Report Sent")}
|
||||
|
|
@ -797,7 +795,7 @@ var newdoc=new_doc;var pscript={};var cur_page;function loadpage(page_name,call_
|
|||
page_name=home_page;var fn=function(r,rt){page_body.set_status('Done');if(page_body.pages[page_name]){var p=page_body.pages[page_name]
|
||||
page_body.change_to(page_name);}else{var p=render_page(page_name);if(!p)return;}
|
||||
cur_page=page_name;if(call_back)call_back();scroll(0,0);pscript.update_page_history(page_name,no_history)
|
||||
try{if(pscript['refresh_'+page_name])pscript['refresh_'+page_name]();}catch(e){submit_error(e);}}
|
||||
try{if(pscript['refresh_'+page_name])pscript['refresh_'+page_name]();}catch(e){console.log(e);}}
|
||||
if(get_local('Page',page_name)||page_body.pages[page_name])
|
||||
fn();else{args=get_url_dict();args.name=page_name;$c('webnotes.widgets.page.getpage',args,fn);}}
|
||||
pscript.update_page_history=function(page_name,no_history){var arg=null;var t=null;if(window.location.hash){var t=nav_obj.get_page(window.location.hash)}else if(get_url_arg('page')){var t=nav_obj.get_page(get_url_arg('page'))}
|
||||
|
|
@ -819,7 +817,7 @@ function upload_callback(id,fid){uploaders[id].callback(fid);}
|
|||
* lib/js/legacy/webpage/page.js
|
||||
*/
|
||||
|
||||
var pages=[];var stylesheets=[];function Page(page_name,content){var me=this;this.name=page_name;this.onshow=function(){set_title(me.doc.page_title?me.doc.page_title:me.name);try{if(pscript['onshow_'+me.name])pscript['onshow_'+me.name]();}catch(e){submit_error(e);}
|
||||
var pages=[];var stylesheets=[];function Page(page_name,content){var me=this;this.name=page_name;this.onshow=function(){set_title(me.doc.title?me.doc.title:me.name);try{if(pscript['onshow_'+me.name])pscript['onshow_'+me.name](me.wrapper);}catch(e){console.log(e);}
|
||||
cur_frm=null;}
|
||||
this.wrapper=page_body.add_page(page_name,this.onshow);this.cont=this.wrapper
|
||||
if(content)
|
||||
|
|
@ -830,7 +828,7 @@ var pdoc=locals['Page'][page_name];if(pdoc.style)set_style(pdoc.style)
|
|||
if(pdoc.stylesheet){set_style(locals.Stylesheet[pdoc.stylesheet].stylesheet);stylesheets.push(pdoc.stylesheet);}
|
||||
var p=new Page(page_name,pdoc._Page__content?pdoc._Page__content:pdoc.content);var script=pdoc.__script?pdoc.__script:pdoc.script;p.doc=pdoc;if(script){eval(script);}
|
||||
page_body.change_to(page_name);try{if(pscript['onload_'+page_name])
|
||||
pscript['onload_'+page_name](page_body.pages[page_name]);}catch(e){submit_error(e);}
|
||||
pscript['onload_'+page_name](page_body.pages[page_name]);}catch(e){console.log(e);}
|
||||
return p;}
|
||||
function refresh_page(page_name){var fn=function(r,rt){render_page(page_name)}
|
||||
$c('webnotes.widgets.page.getpage',{'name':page_name,stylesheets:JSON.stringify(stylesheets)},fn);}
|
||||
|
|
|
|||
2
js/wn/ui/toolbar.min.js
vendored
2
js/wn/ui/toolbar.min.js
vendored
|
|
@ -63,7 +63,7 @@
|
|||
*/
|
||||
|
||||
wn.ui.toolbar.SelectorDialog=Class.extend({init:function(opts){this.opts=opts;try{this.make_dialog();}catch(e){console.log(e);}
|
||||
this.bind_events();},make_dialog:function(){this.dialog=new wn.widgets.Dialog({title:this.opts.title,width:300,fields:[{fieldtype:'Select',fieldname:'doctype',options:'Select...',label:'Select Type'},{fieldtype:'Button',label:'Go',fieldname:'go'}]});},bind_events:function(){var me=this;$(this.dialog.fields_dict.go.input).click(function(){me.dialog.hide();me.opts.execute(me.dialog.fields_dict.doctype.get_value());});$(this.dialog.fields_dict.doctype.input).change(function(){me.dialog.hide();me.opts.execute($(this).val());});},show:function(){this.dialog.show();this.dialog.fields_dict.doctype.input.focus();return false;},set_values:function(lst){for(var i=0;i<lst.length;i++)
|
||||
this.bind_events();},make_dialog:function(){this.dialog=new wn.widgets.Dialog({title:this.opts.title,width:300,fields:[{fieldtype:'Select',fieldname:'doctype',options:'Select...',label:'Select Type'},{fieldtype:'Button',label:'Go',fieldname:'go'}]});},bind_events:function(){var me=this;$(this.dialog.fields_dict.go.input).click(function(){me.dialog.hide();me.opts.execute(me.dialog.fields_dict.doctype.get_value());});$(this.dialog.fields_dict.doctype.input).change(function(){me.dialog.fields_dict.go.input.click();}).keypress(function(ev){if(ev.which==13){me.dialog.fields_dict.go.input.click();}});},show:function(){this.dialog.show();this.dialog.fields_dict.doctype.input.focus();return false;},set_values:function(lst){for(var i=0;i<lst.length;i++)
|
||||
lst[i]=get_doctype_label(lst[i]);var sel=this.dialog.fields_dict.doctype.input;$(sel).empty();add_sel_options(sel,lst.sort());}})
|
||||
/*
|
||||
* lib/js/wn/ui/toolbar/new.js
|
||||
|
|
|
|||
|
|
@ -37,9 +37,14 @@ wn.ui.toolbar.SelectorDialog = Class.extend({
|
|||
|
||||
// on change
|
||||
$(this.dialog.fields_dict.doctype.input).change(function() {
|
||||
me.dialog.hide();
|
||||
me.opts.execute($(this).val());
|
||||
me.dialog.fields_dict.go.input.click();
|
||||
}).keypress(function(ev) {
|
||||
if(ev.which==13) {
|
||||
me.dialog.fields_dict.go.input.click();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
},
|
||||
show: function() {
|
||||
this.dialog.show();
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class DocType:
|
|||
"""
|
||||
from webnotes import defs
|
||||
from webnotes.utils.transfer import in_transfer
|
||||
if not in_transfer and getattr(defs,'developer_mode', 0):
|
||||
if not in_transfer and getattr(defs,'developer_mode', 0) and self.doc.standard=='Yes':
|
||||
from webnotes.modules.export_module import export_to_files
|
||||
from webnotes.modules import get_module_path, scrub
|
||||
import os
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
{
|
||||
'creation': '2009-05-12 11:19:11',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-01-24 16:05:50',
|
||||
'modified': '2012-01-27 13:26:59',
|
||||
'modified_by': 'Administrator',
|
||||
'owner': 'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all DocType
|
||||
{
|
||||
'_last_update': '1323345145',
|
||||
'_last_update': '1327650972',
|
||||
'allow_copy': 0,
|
||||
'allow_email': 0,
|
||||
'allow_print': 0,
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
'section_style': 'Tabbed',
|
||||
'server_code_error': ' ',
|
||||
'show_in_menu': 0,
|
||||
'version': 9
|
||||
'version': 11
|
||||
},
|
||||
|
||||
# These values are common for all DocField
|
||||
|
|
@ -90,6 +90,20 @@
|
|||
'reqd': 1
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'title',
|
||||
'fieldtype': 'Data',
|
||||
'label': 'Title'
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
'fieldtype': 'Column Break'
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
|
|
@ -118,10 +132,7 @@
|
|||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
'fieldtype': 'HTML',
|
||||
'label': 'Help HTML',
|
||||
'oldfieldtype': 'HTML',
|
||||
'options': '<div class="help-box">To add images, use <b>$image(<i>filename</i>)</b><br>Where file name is the ID or Name of the File record</div>'
|
||||
'fieldtype': 'Section Break'
|
||||
},
|
||||
|
||||
# DocField
|
||||
|
|
@ -157,5 +168,27 @@
|
|||
'options': 'Page Role',
|
||||
'reqd': 0,
|
||||
'search_index': 0
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
'fieldtype': 'Section Break'
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'script',
|
||||
'fieldtype': 'Code',
|
||||
'label': 'Script (JS)'
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'style',
|
||||
'fieldtype': 'Code',
|
||||
'label': 'Style (CSS)'
|
||||
}
|
||||
]
|
||||
|
|
@ -82,6 +82,9 @@ class Document:
|
|||
|
||||
if (doctype and name):
|
||||
self._loadfromdb(doctype, name)
|
||||
else:
|
||||
if not fielddata:
|
||||
self.fields['__islocal'] = 1
|
||||
|
||||
def __nonzero__(self):
|
||||
return True
|
||||
|
|
|
|||
|
|
@ -19,9 +19,10 @@ def clear_cache(user=''):
|
|||
else:
|
||||
webnotes.conn.sql("delete from __SessionCache")
|
||||
webnotes.conn.sql("update tabSessions set sessiondata=NULL")
|
||||
|
||||
webnotes.session['data'] = {}
|
||||
|
||||
|
||||
if webnotes.session:
|
||||
webnotes.session['data'] = {}
|
||||
|
||||
def get():
|
||||
"""get session boot info"""
|
||||
import webnotes.defs
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue