Commit fd05f50e6c3d5ce381bcfc441f689840721a5df2
1 parent
4458c300
Exists in
master
and in
2 other branches
Fix to show full name instead of email
Showing
1 changed file
with
5 additions
and
4 deletions
Show diff stats
js/main.js
| ... | ... | @@ -813,13 +813,12 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers |
| 813 | 813 | var user = Main.getUser(); |
| 814 | 814 | if(user){ |
| 815 | 815 | if(user.person && user.person.name){ |
| 816 | - name = user.person.name + ' - '; | |
| 816 | + name = user.person.name; | |
| 817 | 817 | }else{ |
| 818 | - name = user.email + ' - '; | |
| 818 | + name = user.email; | |
| 819 | 819 | } |
| 820 | - | |
| 821 | 820 | } |
| 822 | - $('#logout-button .name').text(user.email + " - "); | |
| 821 | + $('#logout-button .name').text(name + " - "); | |
| 823 | 822 | $('#logout-button').show(); |
| 824 | 823 | }, |
| 825 | 824 | responseToText: function(responseJSONmessage){ |
| ... | ... | @@ -837,6 +836,8 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers |
| 837 | 836 | } |
| 838 | 837 | msg = msg.replace('password_confirmation', 'campo "confirmação da senha"'); |
| 839 | 838 | msg = msg.replace(/password/g, 'campo "senha"'); |
| 839 | + msg = msg.replace(/login/g, 'campo "nome de usuário"'); | |
| 840 | + msg = msg.replace(/user/g, 'campo "nome de usuário"'); | |
| 840 | 841 | msg = msg.replace('email', 'campo "e-mail"'); |
| 841 | 842 | msg = msg.substring(0, msg.length - 5) + '.'; |
| 842 | 843 | return msg; | ... | ... |