Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fix

Browse Source
This commit is contained in:
Rushabh Mehta 2012-02-29 15:19:20 +05:30
parent 864a47933e
commit 1572adf7f7
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/home/page/activity/activity.js
View File

@ -33,6 +33,10 @@ erpnext.ActivityFeed = Class.extend({
data.add_class = "label-important"; data.add_class = "label-important";
} }
if(date.feed_type=='Assignment') {
data.add_class = "label-warning";
}
// link // link
if(data.doc_name && data.feed_type!='Login') { if(data.doc_name && data.feed_type!='Login') {
data.link = repl('<a href="#!Form/%(doc_type)s/%(doc_name)s">%(doc_name)s</a>', data) data.link = repl('<a href="#!Form/%(doc_type)s/%(doc_name)s">%(doc_name)s</a>', data)

4
erpnext/patches/jan_mar_2012/navupdate.py
View File

@ -32,9 +32,9 @@ def execute():
reload_doc('utilities', 'page', 'todo') reload_doc('utilities', 'page', 'todo')
reload_doc('utilities', 'page', 'calendar') reload_doc('utilities', 'page', 'calendar')
reload_doc('utilities', 'page', 'messages') reload_doc('utilities', 'page', 'messages')
reload_doc('utilities', 'page', 'modules_setup') reload_doc('setup', 'page', 'modules_setup')
reload_doc('utilities', 'page', 'users') reload_doc('utilities', 'page', 'users')
reload_doc('utilities', 'page', 'activity') reload_doc('home', 'page', 'activity')
webnotes.conn.set_value('Control Panel', 'Control Panel', 'home_page', webnotes.conn.set_value('Control Panel', 'Control Panel', 'home_page',
'desktop') 'desktop')

2
erpnext/utilities/page/users/users.js
View File

@ -66,7 +66,7 @@ $.extend(wn.pages.users, {
}, },
render: function(data) { render: function(data) {
if(data.file_list) { if(data.file_list) {
data.imgsrc = 'files/' + data.files_list.split('\n')[0].split(',')[1]; data.imgsrc = 'files/' + data.file_list.split('\n')[0].split(',')[1];
} else { } else {
data.imgsrc = 'lib/images/ui/no_img_' + (data.gender=='Female' ? 'f' : 'm'); data.imgsrc = 'lib/images/ui/no_img_' + (data.gender=='Female' ? 'f' : 'm');
} }