").appendTo(this.$wrapper)
- .css({"margin-bottom": "10px", "margin-right": "15px", "float": "right",
- "text-align": "right", "max-width": "100%"})
+ this.$wrapper = $("
")
+ .appendTo(this.parent)
+ .css({"max-width": "600px", "margin": "0px"});
+ this.$body = $("
").appendTo(this.$wrapper)
+ .css({"margin-bottom": "10px", "max-width": "100%"})
this.$wrapper.on("refresh", function() {
me.$body.empty();
if(me.df.options && me.frm.doc[me.df.options]) {
- me.$img = $("![]("+me.frm.doc[me.df.options]+")
")
+ me.$img = $("")
.appendTo(me.$body);
} else {
me.$buffer = $("
%(info)s", d); - } else { - html = "" + d.value + ""; + var html = "" + d.value + ""; + if(d.value!==d.description) { + html += '
' + d.description + ''; } - return $('') .data('item.autocomplete', d) - .append(html) + .html('
|\s|
<\/div>| )*$/, ''); // remove custom typography (use CSS!) if(this.options.remove_typography) { - html = html.replace(/(font-family|font-size|line-height):[^;]*;/g, ''); - html = html.replace(/<[^>]*(font=['"][^'"]*['"])>/g, function(a,b) { return a.replace(b, ''); }); - html = html.replace(/\s*style\s*=\s*["']\s*["']/g, ''); - return html; + var tmp = $("").html(html); + // remove style attributes + tmp.find("*") + .removeAttr("style") + .removeAttr("font"); + html = tmp.html(); } + + return html; }, init_file_drops: function () { diff --git a/frappe/public/js/frappe/ui/filters.js b/frappe/public/js/frappe/ui/filters.js index 50ba37d494..1b9409e1a6 100644 --- a/frappe/public/js/frappe/ui/filters.js +++ b/frappe/public/js/frappe/ui/filters.js @@ -18,7 +18,7 @@ frappe.ui.FilterList = Class.extend({ me.listobj.run(); }); }, - + show_filters: function() { this.$w.find('.show_filters').toggle(); if(!this.filters.length) @@ -29,7 +29,7 @@ frappe.ui.FilterList = Class.extend({ this.filters = []; this.$w.find('.filter_area').empty(); }, - + add_filter: function(tablename, fieldname, condition, value) { this.push_new_filter(tablename, fieldname, condition, value); // list must be expanded @@ -37,7 +37,7 @@ frappe.ui.FilterList = Class.extend({ this.$w.find('.show_filters').toggle(true); } }, - + push_new_filter: function(tablename, fieldname, condition, value) { this.filters.push(new frappe.ui.Filter({ flist: this, @@ -47,7 +47,7 @@ frappe.ui.FilterList = Class.extend({ value: value })); }, - + get_filters: function() { // get filter values as dict var values = []; @@ -57,7 +57,7 @@ frappe.ui.FilterList = Class.extend({ }) return values; }, - + // remove hidden filters update_filters: function() { var fl = []; @@ -66,7 +66,7 @@ frappe.ui.FilterList = Class.extend({ }) this.filters = fl; }, - + get_filter: function(fieldname) { for(var i in this.filters) { if(this.filters[i].field && this.filters[i].field.df.fieldname==fieldname) @@ -109,29 +109,30 @@ frappe.ui.Filter = Class.extend({ make_select: function() { var me = this; this.fieldselect = new frappe.ui.FieldSelect({ - parent: this.$w.find('.fieldname_select_area'), - doctype: this.doctype, - filter_fields: this.filter_fields, + parent: this.$w.find('.fieldname_select_area'), + doctype: this.doctype, + filter_fields: this.filter_fields, select: function(doctype, fieldname) { me.set_field(doctype, fieldname); } }); + this.fieldselect.set_value(this.doctype, this.fieldname); }, set_events: function() { var me = this; - - this.$w.find('a.close').bind('click', function() { + + this.$w.find('a.close').bind('click', function() { me.$w.css('display','none'); var value = me.field.get_parsed_value(); var fieldname = me.field.df.fieldname; me.field = null; - + // hide filter section if(!me.flist.get_filters().length) { me.flist.$w.find('.set_filters').toggle(true); me.flist.$w.find('.show_filters').toggle(false); } - + me.flist.update_filters(); me.flist.listobj.dirty = true; me.flist.listobj.run(); @@ -144,33 +145,33 @@ frappe.ui.Filter = Class.extend({ me.set_field(me.field.df.parent, me.field.df.fieldname, 'Data'); if(!me.field.desc_area) me.field.desc_area = $a(me.field.wrapper, 'span', 'help', null, - 'values separated by comma'); + 'values separated by comma'); } else { - me.set_field(me.field.df.parent, me.field.df.fieldname, null, - me.$w.find('.condition').val()); + me.set_field(me.field.df.parent, me.field.df.fieldname, null, + me.$w.find('.condition').val()); } }); - + // set the field if(me.fieldname) { // presents given (could be via tags!) this.set_values(me.tablename, me.fieldname, me.condition, me.value); } else { me.set_field(me.doctype, 'name'); - } + } }, - + set_values: function(tablename, fieldname, condition, value) { // presents given (could be via tags!) this.set_field(tablename, fieldname); if(condition) this.$w.find('.condition').val(condition).change(); if(value!=null) this.field.set_input(value); }, - + set_field: function(doctype, fieldname, fieldtype, condition) { var me = this; - + // set in fieldname (again) var cur = me.field ? { fieldname: me.field.df.fieldname, @@ -185,13 +186,12 @@ frappe.ui.Filter = Class.extend({ return; } - var df = copy_dict(me.fieldselect.fields_by_name[doctype][fieldname]); this.set_fieldtype(df, fieldtype); - - // called when condition is changed, + + // called when condition is changed, // don't change if all is well - if(me.field && cur.fieldname == fieldname && df.fieldtype == cur.fieldtype && + if(me.field && cur.fieldname == fieldname && df.fieldtype == cur.fieldtype && df.parent == cur.parent) { return; } @@ -199,13 +199,13 @@ frappe.ui.Filter = Class.extend({ // clear field area and make field me.fieldselect.selected_doctype = doctype; me.fieldselect.selected_fieldname = fieldname; - + // save old text var old_text = null; if(me.field) { old_text = me.field.get_parsed_value(); } - + var field_area = me.$w.find('.filter_field').empty().get(0); var f = frappe.ui.form.make_control({ df: df, @@ -213,13 +213,13 @@ frappe.ui.Filter = Class.extend({ only_input: true, }) f.refresh(); - + me.field = f; - if(old_text) + if(old_text && me.field.df.fieldtype===cur.fieldtype) me.field.set_input(old_text); - + if(!condition) this.set_default_condition(df, fieldtype); - + // run on enter $(me.field.wrapper).find(':input').keydown(function(ev) { if(ev.which==13) { @@ -227,33 +227,33 @@ frappe.ui.Filter = Class.extend({ } }) }, - + set_fieldtype: function(df, fieldtype) { // reset if(df.original_type) df.fieldtype = df.original_type; else df.original_type = df.fieldtype; - + df.description = ''; df.reqd = 0; - + // given if(fieldtype) { df.fieldtype = fieldtype; return; - } - + } + // scrub if(df.fieldtype=='Check') { df.fieldtype='Select'; df.options='No\nYes'; } else if(['Text','Small Text','Text Editor','Code','Tags','Comments'].indexOf(df.fieldtype)!=-1) { - df.fieldtype = 'Data'; + df.fieldtype = 'Data'; } else if(df.fieldtype=='Link' && this.$w.find('.condition').val()!="=") { df.fieldtype = 'Data'; } }, - + set_default_condition: function(df, fieldtype) { if(!fieldtype) { // set as "like" for data fields @@ -261,27 +261,27 @@ frappe.ui.Filter = Class.extend({ this.$w.find('.condition').val('like'); } else { this.$w.find('.condition').val('='); - } - } + } + } }, - + get_value: function() { var me = this; var val = me.field.get_parsed_value(); var cond = me.$w.find('.condition').val(); - + if(me.field.df.original_type == 'Check') { val = (val=='Yes' ? 1 :0); } - + if(cond=='like') { // add % only if not there at the end if ((val.length === 0) || (val.lastIndexOf("%") !== (val.length - 1))) { val = (val || "") + '%'; } } else if(val === '%') val = null; - - return [me.fieldselect.selected_doctype, + + return [me.fieldselect.selected_doctype, me.field.df.fieldname, me.$w.find('.condition').val(), val]; } @@ -311,10 +311,10 @@ frappe.ui.FieldSelect = Class.extend({ return false; } }); - + if(this.filter_fields) { for(var i in this.filter_fields) - this.add_field_option(this.filter_fields[i]) + this.add_field_option(this.filter_fields[i]) } else { this.build_options(); } @@ -340,14 +340,14 @@ frappe.ui.FieldSelect = Class.extend({ var me = this; this.clear(); if(!doctype) return; - + // old style if(doctype.indexOf(".")!==-1) { parts = doctype.split("."); doctype = parts[0]; fieldname = parts[1]; } - + $.each(this.options, function(i, v) { if(v.doctype===doctype && v.fieldname===fieldname) { me.selected_doctype = doctype; @@ -365,7 +365,7 @@ frappe.ui.FieldSelect = Class.extend({ if(d.fieldname=="name") opts.options = me.doctype; return $.extend(copy_dict(d), opts); }); - + // add parenttype column var doctype_obj = locals['DocType'][me.doctype]; if(doctype_obj && cint(doctype_obj.istable)) { @@ -376,7 +376,7 @@ frappe.ui.FieldSelect = Class.extend({ parent: me.doctype, }]); } - + // blank if(this.with_blank) { this.options.push({ @@ -414,7 +414,7 @@ frappe.ui.FieldSelect = Class.extend({ var label = df.label + ' (' + df.parent + ')'; var table = df.parent; } - if(frappe.model.no_value_type.indexOf(df.fieldtype)==-1 && + if(frappe.model.no_value_type.indexOf(df.fieldtype)==-1 && !(me.fields_by_name[df.parent] && me.fields_by_name[df.parent][df.fieldname])) { this.options.push({ label: __(label), @@ -423,7 +423,7 @@ frappe.ui.FieldSelect = Class.extend({ doctype: df.parent }) if(!me.fields_by_name[df.parent]) me.fields_by_name[df.parent] = {}; - me.fields_by_name[df.parent][df.fieldname] = df; + me.fields_by_name[df.parent][df.fieldname] = df; } }, }) diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js index 63ea4f1d61..b1e54dc8b7 100644 --- a/frappe/public/js/frappe/ui/toolbar/toolbar.js +++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js @@ -257,5 +257,8 @@ frappe.ui.toolbar.show_about = function() { } frappe.ui.toolbar.show_banner = function(msg) { - return $('').html(msg).appendTo($('header')); + $banner = $('') + .appendTo($('header')); + $banner.find(".close").click(function() { $(".toolbar-banner").toggle(false); }); + return $banner; } diff --git a/frappe/public/js/frappe/views/grid_report.js b/frappe/public/js/frappe/views/grid_report.js index d3ef7b70e4..3dc7314cd0 100644 --- a/frappe/public/js/frappe/views/grid_report.js +++ b/frappe/public/js/frappe/views/grid_report.js @@ -20,7 +20,7 @@ $.extend(frappe.report_dump, { $.each(r.message, function(doctype, doctype_data) { frappe.report_dump.set_data(doctype, doctype_data); }); - + // reverse map names $.each(r.message, function(doctype, doctype_data) { // only if not pre-loaded @@ -38,7 +38,7 @@ $.extend(frappe.report_dump, { } } }); - + callback(); }, progress_bar: progress_bar @@ -62,7 +62,7 @@ $.extend(frappe.report_dump, { var row = make_row(d); replace_dict[row.name] = row; }); - + // replace old data $.each(frappe.report_dump.data[doctype], function(i, d) { if(replace_dict[d.name]) { @@ -75,13 +75,13 @@ $.extend(frappe.report_dump, { data.push(d); } }); - + // add new records $.each(replace_dict, function(name, d) { data.push(d); }) } else { - + // first loading $.each(doctype_data.data, function(i, d) { data.push(make_row(d)); @@ -96,20 +96,20 @@ frappe.provide("frappe.views"); frappe.views.GridReport = Class.extend({ init: function(opts) { frappe.require("assets/js/slickgrid.min.js"); - + this.filter_inputs = {}; this.preset_checks = []; this.tree_grid = {show: false}; var me = this; $.extend(this, opts); - + this.wrapper = $('
")
@@ -694,7 +695,7 @@ frappe.ui.form.ControlSelect = frappe.ui.form.ControlData.extend({
// set the default option (displayed)
var input_value = this.$input.val();
var model_value = frappe.model.get_value(this.doctype, this.docname, this.df.fieldname);
- if(model_value == null && input_value != (model_value || "")) {
+ if(model_value == null && (input_value || "") != (model_value || "")) {
this.set_model_value(input_value);
} else {
this.last_value = value;
@@ -784,16 +785,14 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
this.$input.on("focus", function() {
setTimeout(function() {
if(!me.$input.val()) {
- me.$input.val("%").trigger("keydown");
+ me.$input.autocomplete("search", "");
}
- }, 1000)
- })
+ }, 500);
+ });
this.input = this.$input.get(0);
this.has_input = true;
- //this.bind_change_event();
var me = this;
this.setup_buttons();
- //this.setup_typeahead();
this.setup_autocomplete();
},
setup_buttons: function() {
@@ -841,10 +840,19 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
if(value!==me.last_value) {
me.parse_validate_and_set_in_model(value);
}
- }});
+ }
+ });
+ var cache = {};
this.$input.autocomplete({
+ minLength: 0,
source: function(request, response) {
+ if (cache[request.term]!=null) {
+ // from cache
+ response(cache[request.term]);
+ return;
+ }
+
var args = {
'txt': request.term,
'doctype': me.df.options,
@@ -858,6 +866,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
no_spinner: true,
args: args,
callback: function(r) {
+ cache[request.term] = r.results;
response(r.results);
},
});
@@ -879,17 +888,13 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
}
}
}).data('ui-autocomplete')._renderItem = function(ul, d) {
- var html = "";
- if(keys(d).length > 1) {
- d.info = $.map(d, function(val, key) { return ["value", "label"].indexOf(key)!==-1 ? null : val }).join(", ") || "";
- html = repl("%(value)s
%(info)s", d); - } else { - html = "" + d.value + ""; + var html = "" + d.value + ""; + if(d.value!==d.description) { + html += '
' + d.description + ''; } - return $('') .data('item.autocomplete', d) - .append(html) + .html('
' + html + '
') .appendTo(ul); }; // remove accessibility span (for now) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 580db0ca24..53815a57b0 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -109,13 +109,14 @@ frappe.ui.form.Grid = Class.extend({ var me =this; $rows.sortable({ handle: ".data-row, .panel-heading", + helper: 'clone', update: function(event, ui) { - me.frm.doc[me.df.parentfield] = []; + me.frm.doc[me.df.fieldname] = []; $rows.find(".grid-row").each(function(i, item) { var doc = $(item).data("doc"); doc.idx = i + 1; $(this).find(".row-index").html(i + 1); - me.frm.doc[me.df.parentfield].push(doc); + me.frm.doc[me.df.fieldname].push(doc); }); me.frm.dirty(); } diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 472fd57ea5..ad3077bca6 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -122,12 +122,20 @@ frappe.ui.form.Layout = Class.extend({ if(df && df.idx===1) head.css({"margin-top": "0px"}) - if(this.sections.length > 1) - this.section.css({ - "margin-top": "15px", - "border-top": "1px solid #eee" - }); } + + if(df.label || df.show_section_border) { + if(this.sections.length > 1) { + this.section.css("border-top", "1px solid #eee"); + + if (df.label) { + this.section.css("margin-top", "15px"); + } else { + this.section.css("padding-top", "15px"); + } + } + } + if(df.description) { $('' + df.description + '
')
.css("padding-left", "40px")
diff --git a/frappe/public/js/frappe/form/script_manager.js b/frappe/public/js/frappe/form/script_manager.js
index 69b9a75a82..93cd5c8663 100644
--- a/frappe/public/js/frappe/form/script_manager.js
+++ b/frappe/public/js/frappe/form/script_manager.js
@@ -26,7 +26,7 @@ frappe.ui.form.ScriptManager = Class.extend({
name = name || this.frm.docname;
handlers = this.get_handlers(event_name, doctype, name, callback);
if(callback) handlers.push(callback);
-
+
$.each(handlers, function(i, fn) {
fn();
})
@@ -38,7 +38,7 @@ frappe.ui.form.ScriptManager = Class.extend({
$.each(frappe.ui.form.handlers[doctype][event_name], function(i, fn) {
handlers.push(function() { fn(me.frm, doctype, name) });
});
- }
+ }
if(this.frm.cscript[event_name]) {
handlers.push(function() { me.frm.cscript[event_name](me.frm.doc, doctype, name); });
}
@@ -49,6 +49,7 @@ frappe.ui.form.ScriptManager = Class.extend({
},
setup: function() {
var doctype = this.frm.meta;
+ var me = this;
// js
var cs = doctype.__js;
@@ -56,6 +57,15 @@ frappe.ui.form.ScriptManager = Class.extend({
var tmp = eval(cs);
}
+ // setup add fetch
+ $.each(this.frm.fields, function(i, field) {
+ var df = field.df;
+ if(df.fieldtype==="Read Only" && df.options && df.options.indexOf(".")!=-1) {
+ var parts = df.options.split(".");
+ me.frm.add_fetch(parts[0], parts[1], df.fieldname);
+ }
+ });
+
// css
doctype.__css && frappe.dom.set_style(doctype.__css);
},
@@ -72,25 +82,25 @@ frappe.ui.form.ScriptManager = Class.extend({
},
validate_link_and_fetch: function(df, docname, value, callback) {
var me = this;
-
+
if(value) {
var fetch = '';
-
+
if(this.frm && this.frm.fetch_dict[df.fieldname])
fetch = this.frm.fetch_dict[df.fieldname].columns.join(', ');
-
+
return frappe.call({
method:'frappe.widgets.form.utils.validate_link',
type: "GET",
args: {
- 'value': value,
- 'options': df.options,
+ 'value': value,
+ 'options': df.options,
'fetch': fetch
- },
+ },
no_spinner: true,
callback: function(r) {
if(r.message=='Ok') {
- if(r.fetch_values)
+ if(r.fetch_values)
me.set_fetch_values(df, docname, r.fetch_values);
if(callback) callback(value);
} else {
@@ -111,9 +121,9 @@ frappe.ui.form.ScriptManager = Class.extend({
copy_from_first_row: function(parentfield, current_row, fieldnames) {
var doclist = this.frm.doc[parentfield];
if(doclist.length===1 || doclist[0]===current_row) return;
-
+
$.each(fieldnames, function(i, fieldname) {
current_row[fieldname] = doclist[0][fieldname];
});
}
-});
\ No newline at end of file
+});
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index 1979feb745..b8401c69a8 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -207,7 +207,10 @@ frappe.ui.form.Toolbar = Class.extend({
current = this.appframe.get_title_right_text(),
status = null;
- this.appframe.clear_primary_action();
+ if (!this.frm.doc.__unsaved) {
+ // don't clear actions menu if dirty
+ this.appframe.clear_primary_action();
+ }
if (this.can_submit()) {
status = "Submit";
diff --git a/frappe/public/js/frappe/misc/tools.js b/frappe/public/js/frappe/misc/tools.js
index 5614181da0..1a8d6195d4 100644
--- a/frappe/public/js/frappe/misc/tools.js
+++ b/frappe/public/js/frappe/misc/tools.js
@@ -8,17 +8,17 @@ frappe.tools.downloadify = function(data, roles, me) {
msgprint(__("Export not allowed. You need {0} role to export.", [frappe.utils.comma_or(roles)]));
return;
}
-
+
var _get_data = function() { return frappe.tools.to_csv(data); };
var flash_disabled = (navigator.mimeTypes["application/x-shockwave-flash"] == undefined);
-
+
var download_from_server = function() {
open_url_post("/", {
args: { data: data, filename: me.title },
cmd: "frappe.utils.datautils.send_csv_to_client"
}, true);
}
-
+
// save file > abt 200 kb using server call
if((_get_data().length > 200000) || flash_disabled) {
download_from_server();
@@ -36,8 +36,8 @@ frappe.tools.downloadify = function(data, roles, me) {
return me.title + '.csv';
},
data: _get_data,
- swf: 'lib/js/lib/downloadify/downloadify.swf',
- downloadImage: 'lib/js/lib/downloadify/download.png',
+ swf: 'assets/frappe/js/lib/downloadify/downloadify.swf',
+ downloadImage: 'assets/frappe/js/lib/downloadify/download.png',
onComplete: function(){
$(msgobj.msg_area).html("Saved
") }, @@ -46,7 +46,7 @@ frappe.tools.downloadify = function(data, roles, me) { width: 100, height: 30, transparent: true, - append: false + append: false }); } }; @@ -56,11 +56,11 @@ frappe.markdown = function(txt) { frappe.require('assets/frappe/js/lib/markdown.js'); frappe.md2html = new Showdown.converter(); } - + while(txt.substr(0,1)==="\n") { txt = txt.substr(1); } - + // remove leading tab (if they exist in the first line) var whitespace_len = 0, first_line = txt.split("\n")[0]; @@ -69,7 +69,7 @@ frappe.markdown = function(txt) { whitespace_len++; first_line = first_line.substr(1); } - + if(whitespace_len && whitespace_len != first_line.length) { var txt1 = []; $.each(txt.split("\n"), function(i, t) { @@ -77,7 +77,7 @@ frappe.markdown = function(txt) { }) txt = txt1.join("\n"); } - + return frappe.md2html.makeHtml(txt); } @@ -109,9 +109,9 @@ frappe.slickgrid_tools = { } row.push(val); }); - + if(!filter || filter(row, d)) { - res.push(row); + res.push(row); } } return [col_row].concat(res); @@ -119,7 +119,7 @@ frappe.slickgrid_tools = { add_property_setter_on_resize: function(grid) { grid.onColumnsResized.subscribe(function(e, args) { $.each(grid.getColumns(), function(i, col) { - if(col.docfield && col.previousWidth != col.width && + if(col.docfield && col.previousWidth != col.width && !in_list(frappe.model.std_fields_list, col.docfield.fieldname) ) { frappe.call({ method:"frappe.client.make_width_property_setter", @@ -131,7 +131,7 @@ frappe.slickgrid_tools = { field_name: col.docfield.fieldname, property: 'width', value: col.width, - "__islocal": 1 + "__islocal": 1 }] } }); @@ -140,5 +140,5 @@ frappe.slickgrid_tools = { } }); }); - } + } }; diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js index b2f0afc2c0..839ca14b2b 100644 --- a/frappe/public/js/frappe/model/create_new.js +++ b/frappe/public/js/frappe/model/create_new.js @@ -66,7 +66,7 @@ $.extend(frappe.model, { doc[f.fieldname] = v; updated.push(f.fieldname); } else if(f.fieldtype == "Select" && f.options - && f.options.substr(0, 5)!="link:" && f.options!="[Select]") { + && f.options!="[Select]") { doc[f.fieldname] = f.options.split("\n")[0]; } } @@ -166,6 +166,14 @@ $.extend(frappe.model, { }, open_mapped_doc: function(opts) { + if (opts.frm && opts.frm.doc.__unsaved) { + frappe.throw(__("You have unsaved changes in this form. Please save before you continue.")); + + } else if (!opts.source_name && opts.frm) { + opts.source_name = opts.frm.doc.name; + + } + return frappe.call({ type: "GET", method: opts.method, diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index 4274950869..3e511d752e 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -22,7 +22,7 @@ frappe.ui.Dialog = frappe.ui.FieldGroup.extend({ init: function(opts) { this.display = false; this.is_dialog = true; - if(!opts.width) opts.width = 600; + if(!opts.width) opts.width = "600px"; $.extend(this, opts); this._super(); diff --git a/frappe/public/js/frappe/ui/editor.js b/frappe/public/js/frappe/ui/editor.js index 2bed8d297a..f4d934ca4d 100644 --- a/frappe/public/js/frappe/ui/editor.js +++ b/frappe/public/js/frappe/ui/editor.js @@ -8,7 +8,7 @@ bsEditor = Class.extend({ init: function(options) { - this.options = $.extend(options || {}, this.default_options); + this.options = $.extend({}, this.default_options, options || {}); this.edit_mode = true; if(this.options.editor) { this.setup_editor(this.options.editor); @@ -100,7 +100,7 @@ bsEditor = Class.extend({ active_toolbar_class: 'btn-info', selection_marker: 'edit-focus-marker', selection_color: 'darkgrey', - remove_typography: true, + remove_typography: false, max_file_size: 1, }, @@ -126,15 +126,18 @@ bsEditor = Class.extend({ var html = this.editor.html() || ""; if(!$.trim(this.editor.text()) && !(this.editor.find("img"))) html = ""; - // html = html.replace(/(|\s|
<\/div>| )*$/, ''); // remove custom typography (use CSS!) if(this.options.remove_typography) { - html = html.replace(/(font-family|font-size|line-height):[^;]*;/g, ''); - html = html.replace(/<[^>]*(font=['"][^'"]*['"])>/g, function(a,b) { return a.replace(b, ''); }); - html = html.replace(/\s*style\s*=\s*["']\s*["']/g, ''); - return html; + var tmp = $("").html(html); + // remove style attributes + tmp.find("*") + .removeAttr("style") + .removeAttr("font"); + html = tmp.html(); } + + return html; }, init_file_drops: function () { diff --git a/frappe/public/js/frappe/ui/filters.js b/frappe/public/js/frappe/ui/filters.js index 50ba37d494..1b9409e1a6 100644 --- a/frappe/public/js/frappe/ui/filters.js +++ b/frappe/public/js/frappe/ui/filters.js @@ -18,7 +18,7 @@ frappe.ui.FilterList = Class.extend({ me.listobj.run(); }); }, - + show_filters: function() { this.$w.find('.show_filters').toggle(); if(!this.filters.length) @@ -29,7 +29,7 @@ frappe.ui.FilterList = Class.extend({ this.filters = []; this.$w.find('.filter_area').empty(); }, - + add_filter: function(tablename, fieldname, condition, value) { this.push_new_filter(tablename, fieldname, condition, value); // list must be expanded @@ -37,7 +37,7 @@ frappe.ui.FilterList = Class.extend({ this.$w.find('.show_filters').toggle(true); } }, - + push_new_filter: function(tablename, fieldname, condition, value) { this.filters.push(new frappe.ui.Filter({ flist: this, @@ -47,7 +47,7 @@ frappe.ui.FilterList = Class.extend({ value: value })); }, - + get_filters: function() { // get filter values as dict var values = []; @@ -57,7 +57,7 @@ frappe.ui.FilterList = Class.extend({ }) return values; }, - + // remove hidden filters update_filters: function() { var fl = []; @@ -66,7 +66,7 @@ frappe.ui.FilterList = Class.extend({ }) this.filters = fl; }, - + get_filter: function(fieldname) { for(var i in this.filters) { if(this.filters[i].field && this.filters[i].field.df.fieldname==fieldname) @@ -109,29 +109,30 @@ frappe.ui.Filter = Class.extend({ make_select: function() { var me = this; this.fieldselect = new frappe.ui.FieldSelect({ - parent: this.$w.find('.fieldname_select_area'), - doctype: this.doctype, - filter_fields: this.filter_fields, + parent: this.$w.find('.fieldname_select_area'), + doctype: this.doctype, + filter_fields: this.filter_fields, select: function(doctype, fieldname) { me.set_field(doctype, fieldname); } }); + this.fieldselect.set_value(this.doctype, this.fieldname); }, set_events: function() { var me = this; - - this.$w.find('a.close').bind('click', function() { + + this.$w.find('a.close').bind('click', function() { me.$w.css('display','none'); var value = me.field.get_parsed_value(); var fieldname = me.field.df.fieldname; me.field = null; - + // hide filter section if(!me.flist.get_filters().length) { me.flist.$w.find('.set_filters').toggle(true); me.flist.$w.find('.show_filters').toggle(false); } - + me.flist.update_filters(); me.flist.listobj.dirty = true; me.flist.listobj.run(); @@ -144,33 +145,33 @@ frappe.ui.Filter = Class.extend({ me.set_field(me.field.df.parent, me.field.df.fieldname, 'Data'); if(!me.field.desc_area) me.field.desc_area = $a(me.field.wrapper, 'span', 'help', null, - 'values separated by comma'); + 'values separated by comma'); } else { - me.set_field(me.field.df.parent, me.field.df.fieldname, null, - me.$w.find('.condition').val()); + me.set_field(me.field.df.parent, me.field.df.fieldname, null, + me.$w.find('.condition').val()); } }); - + // set the field if(me.fieldname) { // presents given (could be via tags!) this.set_values(me.tablename, me.fieldname, me.condition, me.value); } else { me.set_field(me.doctype, 'name'); - } + } }, - + set_values: function(tablename, fieldname, condition, value) { // presents given (could be via tags!) this.set_field(tablename, fieldname); if(condition) this.$w.find('.condition').val(condition).change(); if(value!=null) this.field.set_input(value); }, - + set_field: function(doctype, fieldname, fieldtype, condition) { var me = this; - + // set in fieldname (again) var cur = me.field ? { fieldname: me.field.df.fieldname, @@ -185,13 +186,12 @@ frappe.ui.Filter = Class.extend({ return; } - var df = copy_dict(me.fieldselect.fields_by_name[doctype][fieldname]); this.set_fieldtype(df, fieldtype); - - // called when condition is changed, + + // called when condition is changed, // don't change if all is well - if(me.field && cur.fieldname == fieldname && df.fieldtype == cur.fieldtype && + if(me.field && cur.fieldname == fieldname && df.fieldtype == cur.fieldtype && df.parent == cur.parent) { return; } @@ -199,13 +199,13 @@ frappe.ui.Filter = Class.extend({ // clear field area and make field me.fieldselect.selected_doctype = doctype; me.fieldselect.selected_fieldname = fieldname; - + // save old text var old_text = null; if(me.field) { old_text = me.field.get_parsed_value(); } - + var field_area = me.$w.find('.filter_field').empty().get(0); var f = frappe.ui.form.make_control({ df: df, @@ -213,13 +213,13 @@ frappe.ui.Filter = Class.extend({ only_input: true, }) f.refresh(); - + me.field = f; - if(old_text) + if(old_text && me.field.df.fieldtype===cur.fieldtype) me.field.set_input(old_text); - + if(!condition) this.set_default_condition(df, fieldtype); - + // run on enter $(me.field.wrapper).find(':input').keydown(function(ev) { if(ev.which==13) { @@ -227,33 +227,33 @@ frappe.ui.Filter = Class.extend({ } }) }, - + set_fieldtype: function(df, fieldtype) { // reset if(df.original_type) df.fieldtype = df.original_type; else df.original_type = df.fieldtype; - + df.description = ''; df.reqd = 0; - + // given if(fieldtype) { df.fieldtype = fieldtype; return; - } - + } + // scrub if(df.fieldtype=='Check') { df.fieldtype='Select'; df.options='No\nYes'; } else if(['Text','Small Text','Text Editor','Code','Tags','Comments'].indexOf(df.fieldtype)!=-1) { - df.fieldtype = 'Data'; + df.fieldtype = 'Data'; } else if(df.fieldtype=='Link' && this.$w.find('.condition').val()!="=") { df.fieldtype = 'Data'; } }, - + set_default_condition: function(df, fieldtype) { if(!fieldtype) { // set as "like" for data fields @@ -261,27 +261,27 @@ frappe.ui.Filter = Class.extend({ this.$w.find('.condition').val('like'); } else { this.$w.find('.condition').val('='); - } - } + } + } }, - + get_value: function() { var me = this; var val = me.field.get_parsed_value(); var cond = me.$w.find('.condition').val(); - + if(me.field.df.original_type == 'Check') { val = (val=='Yes' ? 1 :0); } - + if(cond=='like') { // add % only if not there at the end if ((val.length === 0) || (val.lastIndexOf("%") !== (val.length - 1))) { val = (val || "") + '%'; } } else if(val === '%') val = null; - - return [me.fieldselect.selected_doctype, + + return [me.fieldselect.selected_doctype, me.field.df.fieldname, me.$w.find('.condition').val(), val]; } @@ -311,10 +311,10 @@ frappe.ui.FieldSelect = Class.extend({ return false; } }); - + if(this.filter_fields) { for(var i in this.filter_fields) - this.add_field_option(this.filter_fields[i]) + this.add_field_option(this.filter_fields[i]) } else { this.build_options(); } @@ -340,14 +340,14 @@ frappe.ui.FieldSelect = Class.extend({ var me = this; this.clear(); if(!doctype) return; - + // old style if(doctype.indexOf(".")!==-1) { parts = doctype.split("."); doctype = parts[0]; fieldname = parts[1]; } - + $.each(this.options, function(i, v) { if(v.doctype===doctype && v.fieldname===fieldname) { me.selected_doctype = doctype; @@ -365,7 +365,7 @@ frappe.ui.FieldSelect = Class.extend({ if(d.fieldname=="name") opts.options = me.doctype; return $.extend(copy_dict(d), opts); }); - + // add parenttype column var doctype_obj = locals['DocType'][me.doctype]; if(doctype_obj && cint(doctype_obj.istable)) { @@ -376,7 +376,7 @@ frappe.ui.FieldSelect = Class.extend({ parent: me.doctype, }]); } - + // blank if(this.with_blank) { this.options.push({ @@ -414,7 +414,7 @@ frappe.ui.FieldSelect = Class.extend({ var label = df.label + ' (' + df.parent + ')'; var table = df.parent; } - if(frappe.model.no_value_type.indexOf(df.fieldtype)==-1 && + if(frappe.model.no_value_type.indexOf(df.fieldtype)==-1 && !(me.fields_by_name[df.parent] && me.fields_by_name[df.parent][df.fieldname])) { this.options.push({ label: __(label), @@ -423,7 +423,7 @@ frappe.ui.FieldSelect = Class.extend({ doctype: df.parent }) if(!me.fields_by_name[df.parent]) me.fields_by_name[df.parent] = {}; - me.fields_by_name[df.parent][df.fieldname] = df; + me.fields_by_name[df.parent][df.fieldname] = df; } }, }) diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js index 63ea4f1d61..b1e54dc8b7 100644 --- a/frappe/public/js/frappe/ui/toolbar/toolbar.js +++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js @@ -257,5 +257,8 @@ frappe.ui.toolbar.show_about = function() { } frappe.ui.toolbar.show_banner = function(msg) { - return $('').html(msg).appendTo($('header')); + $banner = $('') + .appendTo($('header')); + $banner.find(".close").click(function() { $(".toolbar-banner").toggle(false); }); + return $banner; } diff --git a/frappe/public/js/frappe/views/grid_report.js b/frappe/public/js/frappe/views/grid_report.js index d3ef7b70e4..3dc7314cd0 100644 --- a/frappe/public/js/frappe/views/grid_report.js +++ b/frappe/public/js/frappe/views/grid_report.js @@ -20,7 +20,7 @@ $.extend(frappe.report_dump, { $.each(r.message, function(doctype, doctype_data) { frappe.report_dump.set_data(doctype, doctype_data); }); - + // reverse map names $.each(r.message, function(doctype, doctype_data) { // only if not pre-loaded @@ -38,7 +38,7 @@ $.extend(frappe.report_dump, { } } }); - + callback(); }, progress_bar: progress_bar @@ -62,7 +62,7 @@ $.extend(frappe.report_dump, { var row = make_row(d); replace_dict[row.name] = row; }); - + // replace old data $.each(frappe.report_dump.data[doctype], function(i, d) { if(replace_dict[d.name]) { @@ -75,13 +75,13 @@ $.extend(frappe.report_dump, { data.push(d); } }); - + // add new records $.each(replace_dict, function(name, d) { data.push(d); }) } else { - + // first loading $.each(doctype_data.data, function(i, d) { data.push(make_row(d)); @@ -96,20 +96,20 @@ frappe.provide("frappe.views"); frappe.views.GridReport = Class.extend({ init: function(opts) { frappe.require("assets/js/slickgrid.min.js"); - + this.filter_inputs = {}; this.preset_checks = []; this.tree_grid = {show: false}; var me = this; $.extend(this, opts); - + this.wrapper = $('
').appendTo(this.parent);
-
+
if(this.filters) {
this.make_filters();
}
this.make_waiting();
-
+
this.get_data_and_refresh();
},
bind_show: function() {
@@ -118,14 +118,14 @@ frappe.views.GridReport = Class.extend({
// this must be called after init
// because "frappe.container.page" will only be set
// once "load" event is over.
-
+
var me = this;
$(this.page).bind('show', function() {
// reapply filters on show
frappe.cur_grid_report = me;
me.get_data_and_refresh();
});
-
+
},
get_data_and_refresh: function() {
var me = this;
@@ -139,7 +139,7 @@ frappe.views.GridReport = Class.extend({
var progress_bar = null;
if(!this.setup_filters_done)
progress_bar = this.wrapper.find(".progress .progress-bar");
-
+
frappe.report_dump.with_data(this.doctypes, function() {
if(!me.setup_filters_done) {
me.setup_filters();
@@ -160,28 +160,28 @@ frappe.views.GridReport = Class.extend({
function(d) { return d.name; });
me.set_autocomplete(v, opts.list);
}
- });
+ });
// refresh
- this.filter_inputs.refresh && this.filter_inputs.refresh.click(function() {
+ this.filter_inputs.refresh && this.filter_inputs.refresh.click(function() {
me.get_data(function() {
me.refresh();
});
});
-
+
// reset filters
- this.filter_inputs.reset_filters && this.filter_inputs.reset_filters.click(function() {
- me.init_filter_values();
+ this.filter_inputs.reset_filters && this.filter_inputs.reset_filters.click(function() {
+ me.init_filter_values();
me.refresh();
});
-
+
// range
this.filter_inputs.range && this.filter_inputs.range.on("change", function() {
me.refresh();
});
-
+
// plot check
- if(this.setup_plot_check)
+ if(this.setup_plot_check)
this.setup_plot_check();
},
set_filter: function(key, value) {
@@ -223,7 +223,7 @@ frappe.views.GridReport = Class.extend({
filter.val("");
}
});
-
+
this.set_default_values();
},
@@ -232,7 +232,7 @@ frappe.views.GridReport = Class.extend({
from_date: dateutil.str_to_user(sys_defaults.year_start_date),
to_date: dateutil.str_to_user(sys_defaults.year_end_date)
}
-
+
var me = this;
$.each(values, function(i, v) {
if(me.filter_inputs[i] && !me.filter_inputs[i].val())
@@ -281,7 +281,7 @@ frappe.views.GridReport = Class.extend({
});
},
make_waiting: function() {
- this.waiting = frappe.messages.waiting(this.wrapper, __("Loading Report")+"...", '10');
+ this.waiting = frappe.messages.waiting(this.wrapper, __("Loading Report")+"...", '10');
},
load_filter_values: function() {
var me = this;
@@ -298,12 +298,12 @@ frappe.views.GridReport = Class.extend({
}
}
});
-
+
if(this.filter_inputs.from_date && this.filter_inputs.to_date && (this.to_date < this.from_date)) {
msgprint(__("From Date must be before To Date"));
return;
}
-
+
},
make_name_map: function(data, key) {
@@ -314,7 +314,7 @@ frappe.views.GridReport = Class.extend({
})
return map;
},
-
+
reset_item_values: function(item) {
var me = this;
$.each(this.columns, function(i, col) {
@@ -323,7 +323,7 @@ frappe.views.GridReport = Class.extend({
}
});
},
-
+
round_item_values: function(item) {
var me = this;
$.each(this.columns, function(i, col) {
@@ -332,17 +332,17 @@ frappe.views.GridReport = Class.extend({
}
});
},
-
+
round_off_data: function() {
var me = this;
$.each(this.data, function(i, d) {
me.round_item_values(d);
});
},
-
+
refresh: function() {
this.waiting.toggle(false);
- if(!this.grid_wrapper)
+ if(!this.grid_wrapper)
this.make();
this.show_zero = $('.show-zero input:checked').length;
this.load_filter_values();
@@ -361,15 +361,15 @@ frappe.views.GridReport = Class.extend({
setup_dataview_columns: function() {
this.dataview_columns = $.map(this.columns, function(col) {
return !col.hidden ? col : null;
- });
+ });
},
make: function() {
var me = this;
-
+
// plot wrapper
this.plot_area = $('').appendTo(this.wrapper);
-
+
// print / export
$('
\
').appendTo(this.wrapper);
-
+
this.wrapper.find(".grid-report-export").click(function() { return me.export(); });
-
+
// grid wrapper
this.grid_wrapper = $("
")
@@ -392,10 +392,10 @@ frappe.views.GridReport = Class.extend({
+'
').appendTo(this.wrapper);
this.bind_show();
-
+
frappe.cur_grid_report = this;
$(this.wrapper).trigger('make');
-
+
},
apply_filters_from_route: function() {
var me = this;
@@ -432,12 +432,12 @@ frappe.views.GridReport = Class.extend({
me.grid.invalidateRows(args.rows);
me.grid.render();
});
-
+
this.dataView.onRowCountChanged.subscribe(function (e, args) {
me.grid.updateRowCount();
me.grid.render();
});
-
+
this.tree_grid.show && this.add_tree_grid_events();
},
prepare_data_view: function() {
@@ -459,13 +459,13 @@ frappe.views.GridReport = Class.extend({
// from all filter_inputs
var filters = this.filter_inputs;
if(item._show) return true;
-
+
for (i in filters) {
if(!this.apply_filter(item, i)) {
return false;
}
}
-
+
return true;
},
apply_filter: function(item, fieldname) {
@@ -485,11 +485,11 @@ frappe.views.GridReport = Class.extend({
if(col.formatter==me.currency_formatter && !col.hidden) {
if(flt(item[col.field]) > 0.001 || flt(item[col.field]) < -0.001) {
return true;
- }
+ }
}
}
return false;
- }
+ }
return true;
},
show_zero_check: function() {
@@ -497,7 +497,7 @@ frappe.views.GridReport = Class.extend({
this.wrapper.bind('make', function() {
me.wrapper.find('.show-zero').toggle(true).find('input').click(function(){
me.refresh();
- });
+ });
});
},
is_default: function(fieldname) {
@@ -535,16 +535,16 @@ frappe.views.GridReport = Class.extend({
// link_formatter must have
// filter_input, open_btn (true / false), doctype (will be eval'd)
if(!value) return "";
-
+
var me = frappe.cur_grid_report;
-
+
if(dataContext._show) {
return repl('%(value)s', {
_style: dataContext._style || "",
value: value
});
}
-
+
// make link to add a filter
var link_formatter = me.dataview_columns[cell].link_formatter;
if (link_formatter.filter_input) {
@@ -562,8 +562,8 @@ frappe.views.GridReport = Class.extend({
// make icon to open form
if(link_formatter.open_btn) {
- var doctype = link_formatter.doctype
- ? eval(link_formatter.doctype)
+ var doctype = link_formatter.doctype
+ ? eval(link_formatter.doctype)
: dataContext.doctype;
html += me.get_link_open_icon(doctype, value);
}
@@ -576,21 +576,21 @@ frappe.views.GridReport = Class.extend({
return repl(' \
', {
doctype: doctype,
- name: encodeURIComponent(name)
+ name: encodeURIComponent(name)
});
},
make_date_range_columns: function() {
this.columns = [];
-
+
var me = this;
var range = this.filter_inputs.range.val();
this.from_date = dateutil.user_to_str(this.filter_inputs.from_date.val());
this.to_date = dateutil.user_to_str(this.filter_inputs.to_date.val());
var date_diff = dateutil.get_diff(this.to_date, this.from_date);
-
+
me.column_map = {};
me.last_date = null;
-
+
var add_column = function(date) {
me.columns.push({
id: date,
@@ -600,22 +600,22 @@ frappe.views.GridReport = Class.extend({
width: 100
});
}
-
+
var build_columns = function(condition) {
// add column for each date range
for(var i=0; i <= date_diff; i++) {
var date = dateutil.add_days(me.from_date, i);
if(!condition) condition = function() { return true; }
-
+
if(condition(date)) add_column(date);
me.last_date = date;
-
+
if(me.columns.length) {
me.column_map[date] = me.columns[me.columns.length-1];
}
}
}
-
+
// make columns for all date ranges
if(range=='Daily') {
build_columns();
@@ -623,7 +623,7 @@ frappe.views.GridReport = Class.extend({
build_columns(function(date) {
if(!me.last_date) return true;
return !(dateutil.get_diff(date, me.from_date) % 7)
- });
+ });
} else if(range=='Monthly') {
build_columns(function(date) {
if(!me.last_date) return true;
@@ -633,7 +633,7 @@ frappe.views.GridReport = Class.extend({
build_columns(function(date) {
if(!me.last_date) return true;
return dateutil.str_to_obj(date).getDate()==1 && in_list([0,3,6,9], dateutil.str_to_obj(date).getMonth())
- });
+ });
} else if(range=='Yearly') {
build_columns(function(date) {
if(!me.last_date) return true;
@@ -641,15 +641,15 @@ frappe.views.GridReport = Class.extend({
return date==v.year_start_date ? true : null;
}).length;
});
-
+
}
-
+
// set label as last date of period
$.each(this.columns, function(i, col) {
col.name = me.columns[i+1]
? dateutil.str_to_user(dateutil.add_days(me.columns[i+1].id, -1))
- : dateutil.str_to_user(me.to_date);
- });
+ : dateutil.str_to_user(me.to_date);
+ });
},
trigger_refresh_on_change: function(filters) {
var me = this;
@@ -670,10 +670,10 @@ frappe.views.GridReportWithPlot = frappe.views.GridReport.extend({
}
frappe.require('assets/frappe/js/lib/flot/jquery.flot.js');
frappe.require('assets/frappe/js/lib/flot/jquery.flot.downsample.js');
-
+
this.plot = $.plot(this.plot_area.toggle(true), plot_data,
this.get_plot_options());
-
+
this.setup_plot_hover();
},
setup_plot_check: function() {
@@ -692,7 +692,7 @@ frappe.views.GridReportWithPlot = frappe.views.GridReport.extend({
});
}
me.render_plot();
- });
+ });
});
},
setup_plot_hover: function() {
@@ -718,16 +718,16 @@ frappe.views.GridReportWithPlot = frappe.views.GridReport.extend({
me.previousPoint = item.dataIndex;
$("#" + me.tooltip_id).remove();
- showTooltip(item.pageX, item.pageY,
+ showTooltip(item.pageX, item.pageY,
me.get_tooltip_text(item.series.label, item.datapoint[0], item.datapoint[1]));
}
}
else {
$("#" + me.tooltip_id).remove();
- me.previousPoint = null;
+ me.previousPoint = null;
}
});
-
+
},
get_tooltip_text: function(label, x, y) {
var date = dateutil.obj_to_user(new Date(x));
@@ -749,19 +749,19 @@ frappe.views.GridReportWithPlot = frappe.views.GridReport.extend({
points: {show: true},
lines: {show: true, fill: true},
});
-
- // prepend opening
- data[data.length-1].data = [[dateutil.str_to_obj(me.from_date).getTime(),
+
+ // prepend opening
+ data[data.length-1].data = [[dateutil.str_to_obj(me.from_date).getTime(),
item.opening]].concat(data[data.length-1].data);
}
});
-
+
return data.length ? data : false;
},
get_plot_options: function() {
return {
grid: { hoverable: true, clickable: true },
- xaxis: { mode: "time",
+ xaxis: { mode: "time",
min: dateutil.str_to_obj(this.from_date).getTime(),
max: dateutil.str_to_obj(this.to_date).getTime() },
series: { downsample: { threshold: 1000 } }
@@ -780,7 +780,7 @@ frappe.views.TreeGridReport = frappe.views.GridReportWithPlot.extend({
});
if (!this.tl) this.tl = {};
if (!this.tl[parent_doctype]) this.tl[parent_doctype] = [];
-
+
$.each(frappe.report_dump.data[parent_doctype], function(i, parent) {
if(tmap[parent.name]) {
$.each(tmap[parent.name], function(i, d) {
@@ -811,15 +811,15 @@ frappe.views.TreeGridReport = frappe.views.GridReportWithPlot.extend({
var me = frappe.cur_grid_report;
value = value.replace(/&/g,"&").replace(//g,">");
var data = me.data;
- var spacer = "";
var idx = me.dataView.getIdxById(dataContext.id);
var link = me.tree_grid.formatter(dataContext);
-
+
if(dataContext.doctype) {
- link += me.get_link_open_icon(dataContext.doctype, dataContext.name);
+ link += me.get_link_open_icon(dataContext.doctype, dataContext.name);
}
-
+
if (data[idx + 1] && data[idx + 1].indent > data[idx].indent) {
if (dataContext._collapsed) {
return spacer + " " + link;
@@ -833,7 +833,7 @@ frappe.views.TreeGridReport = frappe.views.GridReportWithPlot.extend({
tree_dataview_filter: function(item) {
var me = frappe.cur_grid_report;
if(!me.apply_filters(item)) return false;
-
+
var parent = item[me.tree_grid.parent_field];
while (parent) {
if (me.item_by_name[parent]._collapsed) {
@@ -846,7 +846,7 @@ frappe.views.TreeGridReport = frappe.views.GridReportWithPlot.extend({
prepare_tree: function(item_dt, group_dt) {
var group_data = frappe.report_dump.data[group_dt];
var item_data = frappe.report_dump.data[item_dt];
-
+
// prepare map with child in respective group
var me = this;
var item_group_map = {};
@@ -855,12 +855,12 @@ frappe.views.TreeGridReport = frappe.views.GridReportWithPlot.extend({
var parent = item[me.tree_grid.parent_field];
if(!item_group_map[parent]) item_group_map[parent] = [];
if(group_ids.indexOf(item.name)==-1) {
- item_group_map[parent].push(item);
+ item_group_map[parent].push(item);
} else {
msgprint(__("Ignoring Item {0}, because a group exists with the same name!", [item.name.bold()]));
}
});
-
+
// arrange items besides their parent item groups
var items = [];
$.each(group_data, function(i, group){
@@ -884,7 +884,7 @@ frappe.views.TreeGridReport = frappe.views.GridReportWithPlot.extend({
d.indent = indent;
});
},
-
+
export: function() {
var msgbox = msgprint($.format('{0}
\{1}
\ @@ -902,7 +902,7 @@ frappe.views.TreeGridReport = frappe.views.GridReportWithPlot.extend({ var with_groups = $(msgbox.body).find("[name='with_groups']").prop("checked"); var with_ledgers = $(msgbox.body).find("[name='with_ledgers']").prop("checked"); - var data = frappe.slickgrid_tools.get_view_data(me.columns, me.dataView, + var data = frappe.slickgrid_tools.get_view_data(me.columns, me.dataView, function(row, item) { if(with_groups) { // add row @@ -914,15 +914,15 @@ frappe.views.TreeGridReport = frappe.views.GridReportWithPlot.extend({ if(with_ledgers && (item.group_or_ledger != "Group" && !item.is_group)) { return true; } - + return false; }); - + frappe.tools.downloadify(data, ["Report Manager", "System Manager"], me); return false; }) return false; }, - + }); diff --git a/frappe/public/js/frappe/views/moduleview.js b/frappe/public/js/frappe/views/moduleview.js index 316de269e3..b5f3f3d218 100644 --- a/frappe/public/js/frappe/views/moduleview.js +++ b/frappe/public/js/frappe/views/moduleview.js @@ -216,15 +216,17 @@ frappe.views.moduleview.ModuleView = Class.extend({ }); } else { var route = item.route; - if(item.type==="doctype") { - route = "List/" + encodeURIComponent(item.name); - } else if(item.type==="page") { - route = item.route || item.link || item.name; - } else if(item.type==="report") { - if(item.is_query_report) { - route = "query-report/" + encodeURIComponent(item.name); - } else { - route = "Report/" + encodeURIComponent(item.doctype) + "/" + encodeURIComponent(item.name); + if(!route) { + if(item.type==="doctype") { + route = "List/" + encodeURIComponent(item.name); + } else if(item.type==="page") { + route = item.route || item.link || item.name; + } else if(item.type==="report") { + if(item.is_query_report) { + route = "query-report/" + encodeURIComponent(item.name); + } else { + route = "Report/" + encodeURIComponent(item.doctype) + "/" + encodeURIComponent(item.name); + } } } diff --git a/frappe/public/js/frappe/views/reportview.js b/frappe/public/js/frappe/views/reportview.js index b1e5bad10b..07960f6bc0 100644 --- a/frappe/public/js/frappe/views/reportview.js +++ b/frappe/public/js/frappe/views/reportview.js @@ -117,7 +117,7 @@ frappe.views.ReportView = frappe.ui.Listing.extend({ if(!columns) { var columns = [['name', this.doctype],]; $.each(frappe.meta.docfield_list[this.doctype], function(i, df) { - if(df.in_filter && df.fieldname!='naming_series' + if((df.in_filter || df.in_list_view) && df.fieldname!='naming_series' && !in_list(frappe.model.no_value_type, df.fieldname)) { columns.push([df.fieldname, df.parent]); } diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js index 7356b4a117..d11da18448 100644 --- a/frappe/public/js/legacy/form.js +++ b/frappe/public/js/legacy/form.js @@ -719,6 +719,11 @@ _f.Frm.prototype.disable_save = function() { this.appframe.set_title_right("", null); } +_f.Frm.prototype.enable_save = function() { + this.save_disabled = false; + this.toolbar.set_title_right(); +} + _f.Frm.prototype.save_or_update = function() { if(this.save_disabled) return; diff --git a/frappe/public/js/lib/jquery/bootstrap_theme/jquery-ui.selected.css b/frappe/public/js/lib/jquery/bootstrap_theme/jquery-ui.selected.css index 1c84dd3704..486f9891cc 100644 --- a/frappe/public/js/lib/jquery/bootstrap_theme/jquery-ui.selected.css +++ b/frappe/public/js/lib/jquery/bootstrap_theme/jquery-ui.selected.css @@ -12,56 +12,56 @@ /* Layout helpers ----------------------------------*/ .ui-helper-hidden { display: none; } -.ui-helper-hidden-accessible { +.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; } -.ui-helper-reset { - margin: 0; - padding: 0; - border: 0; - outline: 0; - line-height: 1.3; - text-decoration: none; - font-size: 100%; - list-style: none; +.ui-helper-reset { + margin: 0; + padding: 0; + border: 0; + outline: 0; + line-height: 1.3; + text-decoration: none; + font-size: 100%; + list-style: none; } .ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; } -.ui-helper-clearfix:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; +.ui-helper-clearfix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; } -.ui-helper-clearfix { +.ui-helper-clearfix { /*display: inline-block; */ display:block; min-height: 0; /* support: IE7 */ } /* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { - height:1%; +* html .ui-helper-clearfix { + height:1%; } /* end clearfix */ -.ui-helper-zfix { - width: 100%; - height: 100%; - top: 0; - left: 0; - position: absolute; - opacity: 0; - filter:Alpha(Opacity=0); +.ui-helper-zfix { + width: 100%; + height: 100%; + top: 0; + left: 0; + position: absolute; + opacity: 0; + filter:Alpha(Opacity=0); } .ui-front { z-index: 100; @@ -77,11 +77,11 @@ ----------------------------------*/ /* states and images */ -.ui-icon { - display: block; - text-indent: -99999px; - overflow: hidden; - background-repeat: no-repeat; +.ui-icon { + display: block; + text-indent: -99999px; + overflow: hidden; + background-repeat: no-repeat; } @@ -89,12 +89,12 @@ ----------------------------------*/ /* Overlays */ -.ui-widget-overlay { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; +.ui-widget-overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; } /* @@ -107,72 +107,72 @@ * http://api.jqueryui.com/resizable/ */ -.ui-resizable { +.ui-resizable { position: relative; } -.ui-resizable-handle { +.ui-resizable-handle { position: absolute; font-size: 0.1px; - z-index: 99999; - display: block; + z-index: 99999; + display: block; } -.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { - display: none; +.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { + display: none; } -.ui-resizable-n { - cursor: n-resize; - height: 7px; - width: 100%; - top: -5px; - left: 0; +.ui-resizable-n { + cursor: n-resize; + height: 7px; + width: 100%; + top: -5px; + left: 0; } -.ui-resizable-s { - cursor: s-resize; - height: 7px; - width: 100%; - bottom: -5px; - left: 0; +.ui-resizable-s { + cursor: s-resize; + height: 7px; + width: 100%; + bottom: -5px; + left: 0; } -.ui-resizable-e { - cursor: e-resize; - width: 7px; - right: -5px; - top: 0; - height: 100%; +.ui-resizable-e { + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; } -.ui-resizable-w { - cursor: w-resize; - width: 7px; - left: -5px; - top: 0; - height: 100%; +.ui-resizable-w { + cursor: w-resize; + width: 7px; + left: -5px; + top: 0; + height: 100%; } -.ui-resizable-se { - cursor: se-resize; - width: 12px; - height: 12px; - right: 1px; - bottom: 1px; +.ui-resizable-se { + cursor: se-resize; + width: 12px; + height: 12px; + right: 1px; + bottom: 1px; } -.ui-resizable-sw { - cursor: sw-resize; - width: 9px; - height: 9px; - left: -5px; - bottom: -5px; +.ui-resizable-sw { + cursor: sw-resize; + width: 9px; + height: 9px; + left: -5px; + bottom: -5px; } -.ui-resizable-nw { - cursor: nw-resize; - width: 9px; - height: 9px; - left: -5px; - top: -5px; +.ui-resizable-nw { + cursor: nw-resize; + width: 9px; + height: 9px; + left: -5px; + top: -5px; } -.ui-resizable-ne { - cursor: ne-resize; - width: 9px; - height: 9px; - right: -5px; +.ui-resizable-ne { + cursor: ne-resize; + width: 9px; + height: 9px; + right: -5px; top: -5px; } @@ -185,10 +185,10 @@ * * http://jqueryui.com/selectable/ */ -.ui-selectable-helper { - position: absolute; - z-index: 100; - border:1px dotted black; +.ui-selectable-helper { + position: absolute; + z-index: 100; + border:1px dotted black; } /* @@ -198,17 +198,18 @@ * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * - * + * * * To view and modify this theme, visit http://jqueryui.com/themeroller/ */ /* Component containers ----------------------------------*/ -.ui-widget { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size:13px; } +/*.ui-widget { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size:13px; }*/ .ui-widget .ui-widget { font-size: 1em; } -.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 1em; } -.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(../frappe/js/lib/jquery/bootstrap_theme/images/ui-bg_glass_75_ffffff_1x400.png) 50% 50% repeat-x; color: #404040; } +/*.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 1em; }*/ +/*.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(../frappe/js/lib/jquery/bootstrap_theme/images/ui-bg_glass_75_ffffff_1x400.png) 50% 50% repeat-x; color: #404040; }*/ +.ui-widget-content { border: 1px solid #aaaaaa; background-color: #ffffff; color: #404040;} .ui-widget-content a { color: #404040; } .ui-widget-header { font-weight:bold; @@ -514,41 +515,41 @@ ----------------------------------*/ /* Corner radius */ -.ui-corner-all, -.ui-corner-top, -.ui-corner-left, -.ui-corner-tl { - -moz-border-radius-topleft: 4px; - -webkit-border-top-left-radius: 4px; - -khtml-border-top-left-radius: 4px; - border-top-left-radius: 4px; +.ui-corner-all, +.ui-corner-top, +.ui-corner-left, +.ui-corner-tl { + -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius: 4px; + -khtml-border-top-left-radius: 4px; + border-top-left-radius: 4px; } -.ui-corner-all, -.ui-corner-top, -.ui-corner-right, -.ui-corner-tr { - -moz-border-radius-topright: 4px; - -webkit-border-top-right-radius: 4px; - -khtml-border-top-right-radius: 4px; - border-top-right-radius: 4px; +.ui-corner-all, +.ui-corner-top, +.ui-corner-right, +.ui-corner-tr { + -moz-border-radius-topright: 4px; + -webkit-border-top-right-radius: 4px; + -khtml-border-top-right-radius: 4px; + border-top-right-radius: 4px; } -.ui-corner-all, -.ui-corner-bottom, -.ui-corner-left, -.ui-corner-bl { - -moz-border-radius-bottomleft: 4px; - -webkit-border-bottom-left-radius: 4px; - -khtml-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-left, +.ui-corner-bl { + -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius: 4px; + -khtml-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; } -.ui-corner-all, -.ui-corner-bottom, -.ui-corner-right, -.ui-corner-br { - -moz-border-radius-bottomright: 4px; - -webkit-border-bottom-right-radius: 4px; - -khtml-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-right, +.ui-corner-br { + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + -khtml-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; } @@ -562,11 +563,11 @@ * http://jqueryui.com/autocomplete/ */ -.ui-autocomplete { - position: absolute; +.ui-autocomplete { + position: absolute; top: 0; left: 0; - cursor: default; + cursor: default; } /* @@ -685,9 +686,9 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; } .ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; } .ui-menu .ui-menu-item a.ui-state-focus, -.ui-menu .ui-menu-item a.ui-state-active { - font-weight: normal; - margin: 0; +.ui-menu .ui-menu-item a.ui-state-active { + font-weight: normal; + margin: 0; color: #ffffff; background: #0064cd; background-color: #0064cd; @@ -695,6 +696,11 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad border-color: #0064cd #0064cd #003f81; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } +.ui-menu .ui-menu-item a p { margin: 3px 0px; } +.ui-menu .ui-menu-item a .small { color: #555555; } +.ui-menu .ui-menu-item a.ui-state-focus .small, +.ui-menu .ui-menu-item a.ui-state-active .small { color: #ffffff; } + /* Fix problem with border in ui-state-active */ .ui-menu .ui-menu-item a.ui-state-active { padding: 1px .4em; @@ -884,4 +890,4 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad -moz-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px; -} \ No newline at end of file +} diff --git a/frappe/sessions.py b/frappe/sessions.py index 48e02f3eec..db9c8100d0 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -32,7 +32,7 @@ def clear_cache(user=None): "time_zone"]) def delete_user_cache(user): - for key in ("bootinfo", "lang", "roles", "restrictions"): + for key in ("bootinfo", "lang", "roles", "restrictions", "home_page"): cache.delete_value(key + ":" + user) def clear_notifications(user=None): @@ -60,6 +60,7 @@ def clear_cache(user=None): delete_user_cache(sess.user) cache.delete_value("session:" + sess.sid) + delete_user_cache("Guest") clear_notifications() frappe.defaults.clear_cache() @@ -70,13 +71,24 @@ def clear_sessions(user=None, keep_current=False): if keep_current and frappe.session.sid==sid[0]: continue else: - frappe.cache().delete_value("session:" + sid[0]) - frappe.db.sql("""delete from tabSessions where sid=%s""", (sid[0],)) + delete_session(sid[0]) def delete_session(sid=None): frappe.cache().delete_value("session:" + sid) frappe.db.sql("""delete from tabSessions where sid=%s""", sid) +def clear_all_sessions(): + """This effectively logs out all users""" + frappe.only_for("Administrator") + for sid in frappe.db.sql_list("select sid from `tabSessions`"): + delete_session(sid) + +def clear_expired_sessions(): + """This function is meant to be called from scheduler""" + for sid in frappe.db.sql_list("""select sid + from tabSessions where TIMEDIFF(NOW(), lastupdate) > TIME(%s)""", get_expiry_period()): + delete_session(sid) + def get(): """get session boot info""" from frappe.core.doctype.notification_count.notification_count import \ @@ -139,7 +151,7 @@ class Session: self.data['data']['session_ip'] = frappe.get_request_header('REMOTE_ADDR') if self.user != "Guest": self.data['data']['last_updated'] = frappe.utils.now() - self.data['data']['session_expiry'] = self.get_expiry_period() + self.data['data']['session_expiry'] = get_expiry_period() self.data['data']['session_country'] = get_geo_ip_country(frappe.get_request_header('REMOTE_ADDR')) # insert session @@ -212,7 +224,7 @@ class Session: rec = frappe.db.sql("""select user, sessiondata from tabSessions where sid=%s and TIMEDIFF(NOW(), lastupdate) < TIME(%s)""", (self.sid, - self.get_expiry_period())) + get_expiry_period())) if rec: data = frappe._dict(eval(rec and rec[0][1] or '{}')) data.user = rec[0][0] @@ -261,17 +273,14 @@ class Session: frappe.utils.now()) frappe.cache().set_value("session:" + self.sid, self.data) - def get_expiry_period(self): - exp_sec = frappe.defaults.get_global_default("session_expiry") or "06:00:00" +def get_expiry_period(): + exp_sec = frappe.defaults.get_global_default("session_expiry") or "06:00:00" - # incase seconds is missing - if exp_sec: - if len(exp_sec.split(':')) == 2: - exp_sec = exp_sec + ':00' - else: - exp_sec = "2:00:00" + # incase seconds is missing + if len(exp_sec.split(':')) == 2: + exp_sec = exp_sec + ':00' - return exp_sec + return exp_sec def get_geo_ip_country(ip_addr): try: diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 1f5f1b6754..343e5111f1 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -20,10 +20,6 @@ https://frappe.io/apps/frappe {%- endfor -%} {%- endif -%} - {%- for link in web_include_js %} - - {%- endfor -%} - {%- for link in web_include_css %} {%- endfor -%} @@ -38,6 +34,7 @@ https://frappe.io/apps/frappe
{%- block banner -%}
+ {% include "templates/includes/banner_extension.html" ignore missing %}
{% if banner_html -%}
{{ banner_html or "" }}
{%- endif %}
@@ -92,6 +89,10 @@ https://frappe.io/apps/frappe
{%- block footer -%}{% include "templates/includes/footer.html" %}{%- endblock -%}
+ {%- for link in web_include_js %}
+
+ {%- endfor -%}
+
{%- block script %}
+
diff --git a/frappe/templates/pages/about.html b/frappe/templates/pages/about.html
index e1242c86e5..77ba712e17 100644
--- a/frappe/templates/pages/about.html
+++ b/frappe/templates/pages/about.html
@@ -2,27 +2,27 @@
{% block content %}
- {{ obj.doc.company_introduction or """
{% endfor %}
{% endif %}
-
- {% if obj.get({"doctype":"About Us Team Member"}) %}
-
{% endblock %}
diff --git a/frappe/templates/pages/about.py b/frappe/templates/pages/about.py
index 13554fe53b..b693a703c4 100644
--- a/frappe/templates/pages/about.py
+++ b/frappe/templates/pages/about.py
@@ -1,8 +1,8 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
+# MIT License. See license.txt
from __future__ import unicode_literals
import frappe
def get_context(context):
- return { "obj": frappe.get_doc("About Us Settings", "About Us Settings") }
+ return { "doc": frappe.get_doc("About Us Settings", "About Us Settings") }
diff --git a/frappe/templates/pages/contact.html b/frappe/templates/pages/contact.html
index 9df1b84337..6b09f0d3f2 100644
--- a/frappe/templates/pages/contact.html
+++ b/frappe/templates/pages/contact.html
@@ -1,15 +1,17 @@
{% block title %}{{ heading or "Contact Us"}}{% endblock %}
{% block content %}
+
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/frappe/templates/pages/list.html b/frappe/templates/pages/list.html
new file mode 100644
index 0000000000..11a5b15512
--- /dev/null
+++ b/frappe/templates/pages/list.html
@@ -0,0 +1,84 @@
+{% block title %}{{ type }} {{ _("List") }}{% endblock %}
+
+{% block header %}
+
+{% if txt %} +.options] }})
+ {% else %}
+ {{ d[df.fieldname] or "" }}
+ {% endif %}
+{%- endmacro %}
+
+{% macro get_width(fieldtype) -%}
+ {%- if fieldtype in ("Int", "Check") -%}{{ 60 }}
+ {%- else -%}{{ 150 }}{% endif -%}
+{%- endmacro %}
+
+{% for df in meta.fields %}
+ {% if not df.hidden and not df.permlevel and not df.print_hide %}
+ {% if df.fieldtype=="Section Break" %}
+ field:[fieldname] - By Field\
+ naming_series: - By Naming Series (field called naming_series must be present\
+ Prompt - Prompt user for a name\
+ [series] - Series by prefix (separated by a dot); for example PRE.#####\
+')"">Naming Options ",
+A user can be restricted to multiple records of the same type.,ಬಳಕೆದಾರ ಅದೇ ರೀತಿಯ ಅನೇಕ ದಾಖಲೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ ಮಾಡಬಹುದು .
+About,ಕುರಿತು
+About Us Settings,ನಮ್ಮ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಬಗ್ಗೆ
+About Us Team Member,ನಮ್ಮ ತಂಡದ ಸದಸ್ಯರು ಬಗ್ಗೆ
+Action,ಕ್ರಿಯೆ
+Actions,ಕ್ರಿಯೆಗಳು
+"Actions for workflow (e.g. Approve, Cancel).","ಕೆಲಸದೊತ್ತಡದ ಕ್ರಿಯೆಗಳು ( ಇ ಜಿ ಅನುಮೋದಿಸಿ , ರದ್ದು ) ."
+Add,ಸೇರಿಸು
+Add A New Rule,ಹೊಸ ನಿಯಮ ಸೇರಿಸಿ
+Add A Restriction,ನಿರ್ಬಂಧದ ಸೇರಿಸಿ
+Add Attachments,ಲಗತ್ತುಗಳನ್ನು ಸೇರಿಸಿ
+Add Bookmark,ಸೇರಿಸಿ ಬುಕ್ಮಾರ್ಕ್
+Add CSS,ಸಿಎಸ್ಎಸ್ ಸೇರಿಸಿ
+Add Column,ಅಂಕಣ ಸೇರಿಸಿ
+Add Google Analytics ID: eg. UA-89XXX57-1. Please search help on Google Analytics for more information.,ಗೂಗಲ್ ಅನಾಲಿಟಿಕ್ಸ್ ID ಸೇರಿಸಿ : ಯುಎ ಉದಾ 89XXX57 - 1 . . ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ ಗೂಗಲ್ ಅನಾಲಿಟಿಕ್ಸ್ ಸಹಾಯ ಹುಡುಕಲು ದಯವಿಟ್ಟು .
+Add Message,ಸಂದೇಶ ಸೇರಿಸಿ
+Add New Permission Rule,ಒಂದು ಹೊಸ ಅನುಮತಿ ರೂಲ್ ಸೇರಿಸಿ
+Add Reply,ಉತ್ತರಿಸಿ ಸೇರಿಸಿ
+Add Serial No,ಸೀರಿಯಲ್ ನಂ ಸೇರಿಸಿ
+Add This To User's Restrictions,ಬಳಕೆದಾರರ ನಿರ್ಬಂಧಗಳು ಈ ಸೇರಿಸಿ
+Add Total Row,ಒಟ್ಟು ರೋ ಸೇರಿಸಿ
+Add a New Role,ಹೊಸ ಪಾತ್ರ ಸೇರಿಸಿ
+Add a banner to the site. (small banners are usually good),ಸೈಟ್ ಒಂದು ಬ್ಯಾನರ್ ಸೇರಿಸಿ . ( ಸಣ್ಣ ಬ್ಯಾನರ್ ಸಾಮಾನ್ಯವಾಗಿ ಉತ್ತಮ )
+Add all roles,ಎಲ್ಲಾ ಪಾತ್ರಗಳನ್ನು ಸೇರಿಸಿ
+Add attachment,ಲಗತ್ತು ಸೇರಿಸಿ
+Add code as <script>,
Some Introduction about your company that you would - like your website visitor to know. - More people than you think will read your About page. - People always like to know who the are doing business with. - Be authentic and avoid using jargon like 'value added services' etc. - Be sure to update your company history and + {{ doc.company_introduction or """
Some Introduction about your company that you would + like your website visitor to know. + More people than you think will read your About page. + People always like to know who the are doing business with. + Be authentic and avoid using jargon like 'value added services' etc. + Be sure to update your company history and list of key team members in Website > About Us Settings
""" }} - - {% if obj.get({"doctype":"Company History"}) %} -{{ obj.doc.company_history_heading or "Company History" }}
- {% for d in obj.get({"doctype":"Company History"}) %} + + {% if doc.get({"doctype":"Company History"}) %} +{{ doc.company_history_heading or "Company History" }}
+ {% for d in doc.get({"doctype":"Company History"}) %}{{ d.year }}
{{ d.highlight }}
{{ obj.doc.team_members_heading or "Team Members" }}
- {% for d in obj.get({"doctype":"About Us Team Member"}) %} + + {% if doc.get({"doctype":"About Us Team Member"}) %} +{{ doc.team_members_heading or "Team Members" }}
+ {% for d in doc.get({"doctype":"About Us Team Member"}) %}
@@ -35,6 +35,6 @@
{% endfor %}
{% endif %}
- {{ obj.doc.footer or "" }}
+ {{ doc.footer or "" }}
-
- {{ introduction or ""}}
+
-
@@ -53,9 +55,8 @@
{% endif %}
{{ type }} {{ _("List") }}
+{% endblock %} + +{% block content %} + +
+
+
+
+
++{% if txt %} +
Results filtered by {{ txt }}. ×
+{% endif %}
+
+{% for item in items %}
+
+
+{% endblock %}
+
+{% block script %}
+
+{% endblock %}
diff --git a/frappe/templates/pages/list.py b/frappe/templates/pages/list.py
new file mode 100644
index 0000000000..0e05b2f288
--- /dev/null
+++ b/frappe/templates/pages/list.py
@@ -0,0 +1,50 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+import frappe, os
+from frappe.modules import get_doc_path
+from jinja2 import Environment, Template, FileSystemLoader
+
+no_cache = 1
+no_sitemap = 1
+
+def get_context(context):
+ context.type = frappe.local.form_dict.type
+ context.txt = frappe.local.form_dict.txt
+ context.update(get_items(context.type, context.txt))
+ return context
+
+@frappe.whitelist(allow_guest=True)
+def get_items(type, txt, limit_start=0):
+ meta = frappe.get_meta(type)
+ filters, or_filters = [], []
+ out = frappe._dict()
+
+ if txt:
+ if meta.search_fields:
+ for f in meta.get_search_fields():
+ or_filters.append([type, f.strip(), "like", "%" + txt + "%"])
+ else:
+ filters.append([type, "name", "like", "%" + txt + "%"])
+
+
+ out.raw_items = frappe.get_list(type, fields = ["*"],
+ filters=filters, or_filters = or_filters, limit_start=limit_start,
+ limit_page_length = 20)
+ template_path = os.path.join(get_doc_path(meta.module, "DocType", meta.name), "list_item.html")
+
+ if os.path.exists(template_path):
+ env = Environment(loader = FileSystemLoader("/"))
+ #template_path = os.path.relpath(template_path)
+ template = env.get_template(template_path)
+ else:
+ template = Template("""""")
+
+ out.items = [template.render(doc=i, doctype=type,
+ title_field = meta.title_field or "name") for i in out.raw_items]
+
+ out.meta = meta
+
+ return out
diff --git a/frappe/templates/pages/message.html b/frappe/templates/pages/message.html
index df8f6ac7af..2c70bf8457 100644
--- a/frappe/templates/pages/message.html
+++ b/frappe/templates/pages/message.html
@@ -7,4 +7,4 @@
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/frappe/templates/pages/rss.py b/frappe/templates/pages/rss.py
index a02f1dda11..ac77be2d2d 100644
--- a/frappe/templates/pages/rss.py
+++ b/frappe/templates/pages/rss.py
@@ -1,5 +1,5 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
+# MIT License. See license.txt
from __future__ import unicode_literals
import frappe
@@ -11,11 +11,11 @@ base_template_path = "templates/pages/rss.xml"
def get_context(context):
"""generate rss feed"""
-
+
host = get_request_site_address()
-
+
blog_list = frappe.db.sql("""\
- select page_name as name, published_on, modified, title, content from `tabBlog Post`
+ select page_name as name, published_on, modified, title, content from `tabBlog Post`
where ifnull(published,0)=1
order by published_on desc limit 20""", as_dict=1)
@@ -23,22 +23,21 @@ def get_context(context):
blog_page = cstr(urllib.quote(blog.name.encode("utf-8"))) + ".html"
blog.link = urllib.basejoin(host, blog_page)
blog.content = escape_html(blog.content or "")
-
+
if blog_list:
modified = max((blog['modified'] for blog in blog_list))
else:
modified = now()
- ws = frappe.get_doc('Website Settings', 'Website Settings')
+ blog_settings = frappe.get_doc('Blog Settings', 'Blog Settings')
context = {
- 'title': ws.title_prefix,
- 'description': ws.description or ((ws.title_prefix or "") + ' Blog'),
+ 'title': blog_settings.blog_title or "Blog",
+ 'description': blog_settings.blog_introduction or "",
'modified': modified,
'items': blog_list,
'link': host + '/blog'
}
-
+
# print context
return context
-
\ No newline at end of file
diff --git a/frappe/templates/pages/view.html b/frappe/templates/pages/view.html
new file mode 100644
index 0000000000..3c0acf0a37
--- /dev/null
+++ b/frappe/templates/pages/view.html
@@ -0,0 +1,78 @@
+{% block title %}{{ doc.doctype }} / {{ doc[meta.title_field or "name"] }}{% endblock %}
+
+{% block header %}
+
+ {{ item }}
+
+{% endfor %}
+{{ doc[meta.title_field or "name"] }}
+{{ doc.doctype }} {{ _("List") }}
+{% endblock %} + +{% block content %} +{% if custom_view %} +{{ custom_view }} +{% else %} + +{% macro print_value(df, d, meta) -%} + {% if df.fieldtype=="Check" %} + + {% elif df.fieldtype=="Image" %} +{{ df.label or "" }}
+ {% elif df.fieldtype=="Column Break" %} + {% elif df.fieldtype=="Table" %} + {% set table_meta = frappe.get_meta(df.options) %} +
+
+
+
+
+ {% else %}
+ | Sr | + {% for tdf in table_meta.fields %} + {% if tdf.fieldtype not in ("Column Break", "Section Break") + and tdf.label %} ++ {{ tdf.label }} | + {% endif %} + {% endfor %} +
|---|---|
| {{ d.idx }} | + {% for tdf in table_meta.fields %} + {% if tdf.fieldtype not in ("Column Break", "Section Break") %} +{{ print_value(tdf, d, table_meta) }} | + {% endif %} + {% endfor %} +
+
+ {% endif %}
+ {% endif %}
+{% endfor %}
+{% endif %}
+{% endblock %}
diff --git a/frappe/templates/pages/view.py b/frappe/templates/pages/view.py
new file mode 100644
index 0000000000..7e72a8895c
--- /dev/null
+++ b/frappe/templates/pages/view.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+no_cache = 1
+no_sitemap = 1
+
+def get_context(context):
+ doc = frappe.get_doc(frappe.local.form_dict.doctype, frappe.local.form_dict.name)
+ doc.run_method("make_view")
+ return {
+ "doc": doc,
+ "meta": doc.meta
+ }
diff --git a/frappe/templates/pages/website_script.js b/frappe/templates/pages/website_script.js
index 63a4634248..3b84bdd084 100644
--- a/frappe/templates/pages/website_script.js
+++ b/frappe/templates/pages/website_script.js
@@ -10,4 +10,4 @@ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
ga('create', '{{ google_analytics_id }}', 'auto');
ga('send', 'pageview');
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/frappe/test_runner.py b/frappe/test_runner.py
index 128961600a..78ff15dce9 100644
--- a/frappe/test_runner.py
+++ b/frappe/test_runner.py
@@ -114,8 +114,6 @@ def make_test_records(doctype, verbose=0):
frappe.connect()
for options in get_dependencies(doctype):
- if options.startswith("link:"):
- options = options[5:]
if options == "[Select]":
continue
@@ -195,6 +193,8 @@ def make_test_objects(doctype, test_records, verbose=None):
doc["doctype"] = doctype
d = frappe.copy_doc(doc)
+ if doc.get('name'):
+ d.name = doc.get('name')
if frappe.local.test_objects.get(d.doctype):
# do not create test records, if already exists
diff --git a/frappe/tests/test_client_login.py b/frappe/tests/test_client_login.py
index 13fa82777c..e5a44d5ced 100644
--- a/frappe/tests/test_client_login.py
+++ b/frappe/tests/test_client_login.py
@@ -4,20 +4,20 @@
import unittest, frappe
from frappe.utils import sel
-class TestLogin(unittest.TestCase):
- def setUp(self):
- sel.login(sel.get_localhost())
-
- def test_login(self):
- self.assertEquals(sel.driver.current_url, sel.get_localhost() + "/desk")
-
- def test_to_do(self):
- sel.module("ToDo")
- sel.find('.appframe-iconbar .icon-plus')[0].click()
- sel.wait_for_page("Form/ToDo")
- sel.set_field("description", "test description")
- sel.primary_action()
- self.assertTrue(sel.wait_for_state("clean"))
+# class TestLogin(unittest.TestCase):
+# def setUp(self):
+# sel.login()
+#
+# def test_login(self):
+# self.assertEquals(sel._driver.current_url, sel.get_localhost() + "/desk")
+#
+# def test_to_do(self):
+# sel.go_to_module("ToDo")
+# sel.find('.appframe-iconbar .icon-plus')[0].click()
+# sel.wait_for_page("Form/ToDo")
+# sel.set_field("description", "test description", "textarea")
+# sel.primary_action()
+# self.assertTrue(sel.wait_for_state("clean"))
# def test_material_request(self):
# sel.new_doc("Stock", "Material Request")
diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py
index 8aac135271..abdf219ec8 100644
--- a/frappe/tests/test_db_query.py
+++ b/frappe/tests/test_db_query.py
@@ -8,7 +8,7 @@ from frappe.model.db_query import DatabaseQuery
class TestReportview(unittest.TestCase):
def test_basic(self):
self.assertTrue({"name":"DocType"} in DatabaseQuery("DocType").execute(limit_page_length=None))
-
+
def test_fields(self):
self.assertTrue({"name":"DocType", "issingle":0} \
in DatabaseQuery("DocType").execute(fields=["name", "issingle"], limit_page_length=None))
@@ -16,7 +16,7 @@ class TestReportview(unittest.TestCase):
def test_filters_1(self):
self.assertFalse({"name":"DocType"} \
in DatabaseQuery("DocType").execute(filters=[["DocType", "name", "like", "J%"]]))
-
+
def test_filters_2(self):
self.assertFalse({"name":"DocType"} \
in DatabaseQuery("DocType").execute(filters=[{"name": ["like", "J%"]}]))
@@ -28,4 +28,12 @@ class TestReportview(unittest.TestCase):
def test_filters_4(self):
self.assertTrue({"name":"DocField"} \
in DatabaseQuery("DocType").execute(filters={"name": "DocField"}))
-
\ No newline at end of file
+
+ def test_or_filters(self):
+ data = DatabaseQuery("DocField").execute(
+ filters={"parent": "DocType"}, fields=["fieldname", "fieldtype"],
+ or_filters=[{"fieldtype":"Table"}, {"fieldtype":"Select"}])
+
+ self.assertTrue({"fieldtype":"Table", "fieldname":"fields"} in data)
+ self.assertTrue({"fieldtype":"Select", "fieldname":"document_type"} in data)
+ self.assertFalse({"fieldtype":"Check", "fieldname":"issingle"} in data)
diff --git a/frappe/tests/test_defaults.py b/frappe/tests/test_defaults.py
index 2c0fbb4c61..411e8e6651 100644
--- a/frappe/tests/test_defaults.py
+++ b/frappe/tests/test_defaults.py
@@ -7,6 +7,7 @@ from frappe.defaults import *
class TestDefaults(unittest.TestCase):
def test_global(self):
+ clear_user_default("key1")
set_global_default("key1", "value1")
self.assertEquals(get_global_default("key1"), "value1")
@@ -28,7 +29,7 @@ class TestDefaults(unittest.TestCase):
add_user_default("key1", "3value3")
self.assertEquals(get_user_default("key1"), "2value2")
self.assertEquals(get_user_default_as_list("key1"), ["2value2", "3value3"])
-
+
def test_global_if_not_user(self):
set_global_default("key4", "value4")
self.assertEquals(get_user_default("key4"), "value4")
@@ -38,7 +39,7 @@ class TestDefaults(unittest.TestCase):
self.assertEquals(get_user_default("key5"), "value5")
clear_user_default("key5")
self.assertEquals(get_user_default("key5"), None)
-
+
def test_clear_global(self):
set_global_default("key6", "value6")
self.assertEquals(get_user_default("key6"), "value6")
diff --git a/frappe/translate.py b/frappe/translate.py
index 309f144a46..373d6382cb 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -66,7 +66,7 @@ def get_user_lang(user=None):
default_lang = frappe.db.get_default("lang")
lang = default_lang or frappe.local.lang
- frappe.cache().set_value("lang:" + user, lang)
+ frappe.cache().set_value("lang:" + user, lang or "en")
return lang
@@ -133,7 +133,8 @@ def get_lang_js(fortype, name):
return "\n\n$.extend(frappe._messages, %s)" % json.dumps(get_dict(fortype, name))
def get_full_dict(lang):
- if lang == "en": return {}
+ if lang == "en":
+ return {}
return frappe.cache().get_value("lang:" + lang, lambda:load_lang(lang))
def load_lang(lang, apps=None):
@@ -196,7 +197,6 @@ def get_messages_from_doctype(name):
messages.extend([d.label, d.description])
if d.fieldtype=='Select' and d.options \
- and not d.options.startswith("link:") \
and not d.options.startswith("attach_files:"):
options = d.options.split('\n')
if not "icon" in options[0]:
diff --git a/frappe/translations/kn.csv b/frappe/translations/kn.csv
new file mode 100644
index 0000000000..d501411dc1
--- /dev/null
+++ b/frappe/translations/kn.csv
@@ -0,0 +1,1360 @@
+ by Role ,
+ is not set,
+""" does not exists",""" ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
+"""Company History""",""" ಕಂಪೆನಿ ಇತಿಹಾಸ """
+"""Team Members"" or ""Management""","""ತಂಡದ ಸದಸ್ಯರು"" ಅಥವಾ "" ನಿರ್ವಹಣೆ """
+'In List View' not allowed for type {0} in row {1},' ListView ರಲ್ಲಿ ' ಅವಕಾಶ ಮಾದರಿ {0} ಸತತವಾಗಿ {1}
+'link:' type Select {0} getting replaced,' ಲಿಂಕ್ : ' ಆಯ್ಕೆಮಾಡಿ {0} ಬದಲಿಗೆ ಗೆಟ್ಟಿಂಗ್
+"000 is black, fff is white","000 ಕಪ್ಪು , fff ಬಿಳಿ"
+2 days ago,2 ದಿನಗಳ ಹಿಂದೆ
+"[?]","ಕವಿದ href=""https://en.wikipedia.org/wiki/Transport_Layer_Security"" target = [ ? ] "
+"\
+
+ {% if df.fieldtype not in ("Image","HTML") %}
+
+ {% endif %}
+
+
+ {{ print_value(df, doc, meta) }}
+
+