diff --git a/app/views/users/_user_rows.html.erb b/app/views/users/_user_rows.html.erb index 6d53a9f6f..bb380dd53 100644 --- a/app/views/users/_user_rows.html.erb +++ b/app/views/users/_user_rows.html.erb @@ -6,12 +6,12 @@ <%= member.inactive_icon %> <%= member.link_to_self %> - <%= member.mail_to %> - <%= member.phone %> - <%= member.alt_phone %> - <%= member.account_balance %> + <%= member.mail_to %> + <%= member.phone %> + <%= member.alt_phone %> + <%= member.account_balance %> <% if current_user.manages?(current_organization) %> - + <%= link_to member.edit_user_path, class: "action" do %> <%= glyph :pencil %> <%= t "global.edit" %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 0b2ec3aeb..037d7ce0d 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -42,27 +42,26 @@
- - - - - <% if current_user.manages? current_organization %> - diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 27b5b4c54..e2d51b942 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -73,7 +73,7 @@ it 'shows data for her membership in the current organization' do get :index - expect(response.body).to include("") + expect(response.body).to include("13:33") end end
ID <%= sort_link @search, :user_username, User.human_attribute_name(:username) %> + + + + + 13:33