From 9551f6b383615f1ff21ae67b958c0a7f38cb122b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 22 Mar 2012 14:26:53 +0530 Subject: [PATCH 1/2] listing - ajax icon --- js/wn/views/doclistview.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/wn/views/doclistview.js b/js/wn/views/doclistview.js index 0aa896a5f3..88f835f51e 100644 --- a/js/wn/views/doclistview.js +++ b/js/wn/views/doclistview.js @@ -399,10 +399,10 @@ wn.views.ListView = Class.extend({ if(diff==0) { data.when = 'Today' } - if(diff == -1) { + if(diff == 1) { data.when = 'Yesterday' } - if(diff == -2) { + if(diff == 2) { data.when = '2 days ago' } From ea1bb38c1533903aebaeb0b04ce09ae0f99fbdef Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 22 Mar 2012 14:27:11 +0530 Subject: [PATCH 2/2] doclistview --- js/core.min.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/core.min.js b/js/core.min.js index fb71952fa8..80850684c6 100644 --- a/js/core.min.js +++ b/js/core.min.js @@ -279,8 +279,8 @@ $(parent).html(repl('\ ',args));} else if(data[opts.content]){$(parent).append(' '+data[opts.content]);}},render:function(row,data){var me=this;this.prepare_data(data);rowhtml='';$.each(this.columns,function(i,v){rowhtml+=repl('',v);});var tr=$(row).html(''+rowhtml+'
').find('tr').get(0);$.each(this.columns,function(i,v){me.render_column(data,tr.cells[i],v);});},prepare_data:function(data){data.fullname=wn.user_info(data.owner).fullname;data.avatar=wn.user_info(data.owner).image;data.when=dateutil.str_to_user(data.modified).split(' ')[0];var diff=dateutil.get_diff(dateutil.get_today(),data.modified.split(' ')[0]);if(diff==0){data.when='Today'} -if(diff==-1){data.when='Yesterday'} -if(diff==-2){data.when='2 days ago'} +if(diff==1){data.when='Yesterday'} +if(diff==2){data.when='2 days ago'} if(data.docstatus==0||data.docstatus==null){data.docstatus_icon='icon-pencil';data.docstatus_title='Editable';}else if(data.docstatus==1){data.docstatus_icon='icon-lock';data.docstatus_title='Submitted';}else if(data.docstatus==2){data.docstatus_icon='icon-remove';data.docstatus_title='Cancelled';}},add_user_tags:function(parent,data){var me=this;if(data._user_tags){$.each(data._user_tags.split(','),function(i,t){if(t){$('' +strip(t)+'').click(function(){me.doclistview.set_filter('_user_tags',$(this).text())}).appendTo(parent);}});}}}) /*