Skip to content

Commit

Permalink
header fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
damianlegawiec committed May 2, 2024
1 parent 783aa78 commit 32cb1aa
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ platforms :ruby do
elsif ENV['DB'] == 'postgres'
gem 'pg'
else
gem 'sqlite3'
gem 'sqlite3', '~> 1.4'
end
end

Expand Down
4 changes: 2 additions & 2 deletions app/views/spree/admin/shared/_account_nav.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<div class="dropdown-menu dropdown-menu-right overflow-hidden mt-2 p-0 mr-2">
<div class="dropdown-item px-0 text-center bg-light">
<span class="d-block"><%= try_spree_current_user.email %></span>
<span class="d-block"><%= try_spree_current_user.try(:email) %></span>
</div>
<div class="dropdown-divider m-0"></div>

Expand All @@ -19,7 +19,7 @@
<% end %>
<% end %>

<% if can?(:manage, try_spree_current_user) %>
<% if can?(:manage, try_spree_current_user) && try_spree_current_user.persisted? %>
<%= link_to spree.edit_admin_user_path(try_spree_current_user), class: 'd-block my-1 dropdown-item' do %>
<%= svg_icon name: "user.svg", width: '14', height: '14' %>
&nbsp;
Expand Down
2 changes: 1 addition & 1 deletion app/views/spree/admin/shared/_header.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% if try_spree_current_user %>
<header class="header logged-in">
<header class="header logged-in" id="header-logged-in" data-turbo-permanent>
<nav class="navbar fixed-top navbar-dark flex-nowrap bg-primary p-0">
<div class="col p-0 d-lg-none">
<button
Expand Down
2 changes: 1 addition & 1 deletion spec/features/admin/products/edit/properties_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

expect(page).to have_current_path(spree.admin_product_product_properties_path(product))
expect(page).to have_content('Add Product Properties')
expect(page).to have_content('SHOW PROPERTY')
expect(page).to have_content('Show Property')
expect(page).to have_selector("input[value='Material']")
expect(page).to have_selector("input[value='Leather']")
expect(page).to have_field('product_product_properties_attributes_0_show_property', checked: true)
Expand Down

0 comments on commit 32cb1aa

Please sign in to comment.