From 9662cb85645a03af883e92b653691ba56f6837bc Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 22 Mar 2012 14:27:05 +0530 Subject: [PATCH] doclistview --- js/all-app.js | 4 ++-- js/all-web.js | 4 ++-- version.num | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/all-app.js b/js/all-app.js index ea41c4fbf7..a79741b711 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -416,8 +416,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);}});}}}) /* diff --git a/js/all-web.js b/js/all-web.js index 34d4b6d3c1..d1b5b18573 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -330,8 +330,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);}});}}}) /* diff --git a/version.num b/version.num index 0bfd2262b7..777d295183 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -1386 \ No newline at end of file +1387 \ No newline at end of file