Adds owner user to project show and permissions pages

Partially addresses #322  (_Project show: List owners_)

app/views/permissions/index.html.haml

@@ -7,7 +7,8 @@
 - menu_edit_link(:project, project_permissions_path(@project), 'permissions')
 
 - content_for :right_sidebar do
-  = render partial: 'shared/sidebar_metadata', locals: {title: 'Creator', text: link_to(@project.creator.user_name, user_account_path(@project.creator))}
+  = render partial: 'shared/sidebar_metadata_user_created', locals: { item: @project }
+  = render partial: 'shared/sidebar_metadata_users', locals: { title: 'Owned by', users: @project.owners }
 
 - anon_level = Access::Core.highest(Access::Core.anon_levels(@project))
 - anon_is_none = anon_level.blank?

app/views/projects/show.html.haml

@@ -1,5 +1,6 @@
 - content_for :meta_title, "Project #{@project.name}"
-- content_for :page_title, @project.name
+- content_for :page_title do
+  = @project.name
 - @info_bar = {model: @project, icon: 'globe'}
 
 - content_for :page_actions do
@@ -22,6 +23,7 @@
     = destroy_button(@project, 'project')
 
 - content_for :right_sidebar do
+  = render partial: 'shared/sidebar_metadata_users', locals: { title: 'Owned by', users: @project.owners }
   - levels = Access::Core.user_levels(current_user, @project)
   - level = Access::Core.highest(levels)
   - unless level.blank?

app/views/shared/_sidebar_metadata_users.html.haml

@@ -1,11 +1,16 @@
--# locals: title, user, subtext
-- if !title.blank? && !user.blank? && !subtext.blank?
+-# locals: title, user, users, subtext
+- user ||= nil
+- users ||= []
+- users << user if user
+- subtext ||= nil
+- if !title.blank? && users.length > 0
   %h4= title
-  .media
-    .media-left.media-middle
-      %a{href: user_account_path(user)}
-        = image_tag user.image.url(:spanhalf), alt: user.user_name, class: 'media-object'
-    .media-body
-      = link_to user.user_name, user_account_path(user)
-      %br/
-      = subtext
+  - users.each do |user|
+    .media
+      .media-left.media-middle
+        %a{href: user_account_path(user)}
+          = image_tag user.image.url(:spanhalf), alt: user.user_name, class: 'media-object'
+      .media-body
+        = link_to user.user_name, user_account_path(user)
+        %br/
+        = subtext

spec/features/permissions_spec.rb

@@ -11,6 +11,14 @@
         expect(page).to have_content('Permissions')
       end
 
+      it 'lists the creator and owner' do
+        visit project_permissions_path(project)
+        expect(page).to have_content('Created by')
+        expect(page).to have_link(project.creator.user_name, user_account_path(project.creator))
+        expect(page).to have_content('Owned by')
+        expect(page).to have_link(owner_user.user_name, user_account_path(owner_user))
+      end
+
       def check_row(user, level)
         overall_selector = "tr[data-user-id='#{user.id}'] .overall-permission"
         overall = find(overall_selector)

spec/features/projects_spec.rb

@@ -29,6 +29,14 @@ def select_by_value(id, value)
     expect(page).not_to have_link('Delete')
   end
 
+  it 'lists the creator and owner' do
+    visit project_path(project)
+    expect(page).to have_content('Created by')
+    expect(page).to have_link(project.creator.user_name, user_account_path(project.creator))
+    expect(page).to have_content('Owned by')
+    expect(page).to have_link(owner_user.user_name, user_account_path(owner_user))
+  end
+
   it 'creates new project when filling out form correctly' do
     visit new_project_path
     fill_in 'project[name]', with: 'test name'
@@ -77,6 +85,14 @@ def select_by_value(id, value)
     expect(page).to have_button('Delete this project')
   end
 
+  it 'lists the creator and owner' do
+    visit project_path(project)
+    expect(page).to have_content('Created by')
+    expect(page).to have_link(project.creator.user_name, user_account_path(project.creator))
+    expect(page).to have_content('Owned by')
+    expect(page).to have_link(owner_user.user_name, user_account_path(owner_user))
+  end
+
   it 'creates new project when filling out form correctly' do
     visit new_project_path
     #save_and_open_page
@@ -124,6 +140,14 @@ def select_by_value(id, value)
     expect(page).not_to have_link('Delete')
   end
 
+  it 'lists the creator and owner' do
+    visit project_path(project)
+    expect(page).to have_content('Created by')
+    expect(page).to have_link(project.creator.user_name, user_account_path(project.creator))
+    expect(page).to have_content('Owned by')
+    expect(page).to have_link(owner_user.user_name, user_account_path(owner_user))
+  end
+
   it 'creates new project when filling out form correctly' do
     visit new_project_path
     fill_in 'project[name]', with: 'test name'
@@ -324,6 +348,14 @@ def select_by_value(id, value)
         expect(page).to have_button('Delete this project')
       end
 
+      it 'lists the creator and owner' do
+        visit project_path(project)
+        expect(page).to have_content('Created by')
+        expect(page).to have_link(project.creator.user_name, user_account_path(project.creator))
+        expect(page).to have_content('Owned by')
+        expect(page).to have_link(owner_user.user_name, user_account_path(owner_user))
+      end
+
       it 'creates new project when filling out form correctly' do
         visit new_project_path
         fill_in 'project_name', with: 'test name'
@@ -372,6 +404,14 @@ def select_by_value(id, value)
         expect(page).to have_button('Delete this project')
       end
 
+      it 'lists the creator and owner' do
+        visit project_path(project)
+        expect(page).to have_content('Created by')
+        expect(page).to have_link(project.creator.user_name, user_account_path(project.creator))
+        expect(page).to have_content('Owned by')
+        expect(page).to have_link(owner_user.user_name, user_account_path(owner_user))
+      end
+
       it 'creates new project when filling out form correctly' do
         visit new_project_path
         fill_in 'project_name', with: 'test name'
@@ -420,6 +460,14 @@ def select_by_value(id, value)
         expect(page).not_to have_link('Delete Project')
       end
 
+      it 'lists the creator and owner' do
+        visit project_path(project)
+        expect(page).to have_content('Created by')
+        expect(page).to have_link(project.creator.user_name, user_account_path(project.creator))
+        expect(page).to have_content('Owned by')
+        expect(page).to have_link(owner_user.user_name, user_account_path(owner_user))
+      end
+
       it 'creates new project when filling out form correctly' do
         visit new_project_path
         fill_in 'project[name]', with: 'test name'
@@ -465,6 +513,14 @@ def select_by_value(id, value)
         expect(page).not_to have_link('Delete Project')
       end
 
+      it 'lists the creator and owner' do
+        visit project_path(project)
+        expect(page).to have_content('Created by')
+        expect(page).to have_link(project.creator.user_name, user_account_path(project.creator))
+        expect(page).to have_content('Owned by')
+        expect(page).to have_link(owner_user.user_name, user_account_path(owner_user))
+      end
+
       it 'creates new project when filling out form correctly' do
         visit new_project_path
         fill_in 'project[name]', with: 'test name'