Skip to content
Extraits de code Groupes Projets
Valider 99289491 rédigé par Steffen van Bergerem's avatar Steffen van Bergerem
Parcourir les fichiers

Merge pull request #6607 from jhass/link_profile_in_user_menu

Link user menu button to the users profile
parents d4fbbd86 f70cefb9
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -85,7 +85,7 @@
<ul class="nav navbar-nav navbar-right">
<li class="dropdown" id="user_menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<a href="{{urlTo "person" current_user.guid}}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<span class="user-avatar pull-left">
{{{personImage current_user "small"}}}
</span>
......
describe("app.views.Header", function() {
beforeEach(function() {
this.userAttrs = {name: "alice", avatar : {small : "http://avatar.com/photo.jpg"}};
this.userAttrs = {name: "alice", avatar: {small: "http://avatar.com/photo.jpg"}, guid: "foo" };
loginAs(this.userAttrs);
......
......@@ -4,6 +4,7 @@ describe("app.views.NotificationDropdown", function() {
gon.appConfig = {settings: {podname: "MyPod"}};
this.header = new app.views.Header();
$("header").prepend(this.header.el);
loginAs({guid: "foo"});
this.header.render();
this.view = new app.views.NotificationDropdown({el: "#notification-dropdown"});
});
......
......@@ -79,7 +79,7 @@ describe("app.views.Notifications", function(){
context("with a header", function() {
beforeEach(function() {
loginAs({name: "alice", avatar : {small : "http://avatar.com/photo.jpg"}, notifications_count : 2});
loginAs({name: "alice", avatar: {small: "http://avatar.com/photo.jpg"}, notifications_count: 2, guid: "foo"});
gon.appConfig = {settings: {podname: "MyPod"}};
this.header = new app.views.Header();
$("header").prepend(this.header.el);
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter