Commit 540da508 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #6267 from robertd/feature-groups-on-profile-screen

Show avatars of groups on profile screen that user belongs to
parents 2f82035f 973066e7
...@@ -26,3 +26,5 @@ $ -> ...@@ -26,3 +26,5 @@ $ ->
form = $(this).closest("form") form = $(this).closest("form")
filename = $(this).val().replace(/^.*[\\\/]/, '') filename = $(this).val().replace(/^.*[\\\/]/, '')
form.find(".js-avatar-filename").text(filename) form.find(".js-avatar-filename").text(filename)
$('.profile-groups-avatars').tooltip("placement": "top")
\ No newline at end of file
...@@ -105,3 +105,12 @@ ...@@ -105,3 +105,12 @@
} }
} }
} }
.profile-groups-avatars {
margin: 0 5px 10px 0;
img {
width: 50px;
height: 50px;
}
}
- groups.each do |group|
= link_to group, class: 'profile-groups-avatars', :title => group.name do
= image_tag group_icon(group.path)
\ No newline at end of file
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
%br %br
%small member since #{@user.created_at.stamp("Nov 12, 2031")} %small member since #{@user.created_at.stamp("Nov 12, 2031")}
.clearfix .clearfix
%h4 Groups:
= render 'groups', groups: @user.groups
%hr %hr
%h4 User Activity: %h4 User Activity:
= render @events = render @events
......
...@@ -6,6 +6,13 @@ Feature: Profile ...@@ -6,6 +6,13 @@ Feature: Profile
Given I visit profile page Given I visit profile page
Then I should see my profile info Then I should see my profile info
Scenario: I can see groups I belong to
Given I have group with projects
When I visit profile page
And I click on my profile picture
Then I should see my user page
And I should see groups I belong to
Scenario: I edit profile Scenario: I edit profile
Given I visit profile page Given I visit profile page
Then I change my profile info Then I change my profile info
......
...@@ -173,4 +173,17 @@ class Profile < Spinach::FeatureSteps ...@@ -173,4 +173,17 @@ class Profile < Spinach::FeatureSteps
page.should have_content current_user.name page.should have_content current_user.name
end end
end end
step 'I have group with projects' do
@group = create(:group)
@group.add_owner(current_user)
@project = create(:project, namespace: @group)
@event = create(:closed_issue_event, project: @project)
@project.team << [current_user, :master]
end
step 'I should see groups I belong to' do
page.should have_css('.profile-groups-avatars', visible: true)
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment