Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Rushabh Mehta 2012-06-07 11:58:16 +05:30
commit 9d18ebbf69
2 changed files with 7 additions and 3 deletions

View File

@ -38,11 +38,13 @@ cur_frm.cscript.render_communication_list = function(doc, dt, dn) {
this._super(data);
data.creation = wn.datetime.str_to_user(data.communication_date);
data.content = cstr(data.subject) + " | " + cstr(data.content);
// replace double quote with blank string
data.content = cstr(data.subject).replace(/"/gi, '')
+ " | " + cstr(data.content).replace(/"/gi, '');
if(data.content && data.content.length > 50) {
data.content = '<span title="'+data.content+'">' +
data.description.substr(0,50) + '...</span>';
data.content.substr(0,50) + '...</span>';
}
},

View File

@ -15,7 +15,9 @@ wn.doclistviews['Communication'] = wn.views.ListView.extend({
this._super(data);
data.creation = wn.datetime.only_date(data.creation);
data.content = cstr(data.subject) + " | " + cstr(data.content);
// replace double quote with blank string
data.content = cstr(data.subject).replace(/"/gi, '')
+ " | " + cstr(data.content).replace(/"/gi, '');
if(data.content && data.content.length > 50) {
data.content = '<span title="'+data.content+'">' +