add helper & fix logic for users show #957
Conversation
|
|
||
| visit user_path(:en, user.id) | ||
|
|
||
| expect(page).to have_content('This user hasn\'t created any gardens yet.') |
app/models/garden.rb
Outdated
| @@ -26,6 +26,12 @@ class Garden | |||
| accepts_nested_attributes_for :pictures | |||
| scope :is_public, -> { where(is_private: true) } | |||
|
|
|||
| def is_user_default? | |||
| default_name = I18n::t('registrations.your_first_garden') | |||
app/models/garden.rb
Outdated
| @@ -26,6 +26,12 @@ class Garden | |||
| accepts_nested_attributes_for :pictures | |||
| scope :is_public, -> { where(is_private: true) } | |||
|
|
|||
| def is_user_default? | |||
There was a problem hiding this comment.
Rename is_user_default? to user_default?.
app/helpers/users_helper.rb
Outdated
| end | ||
|
|
||
| def authorized_for?(user) | ||
| user == current_user && current_user.confirmed? |
There was a problem hiding this comment.
Use 2 (not 4) spaces for indentation.
app/helpers/users_helper.rb
Outdated
| end | ||
|
|
||
| def has_non_default_garden?(user) | ||
| user.gardens.each { |garden| return true unless garden.is_user_default?} |
There was a problem hiding this comment.
Use 2 (not 4) spaces for indentation.
Space missing inside }.
app/helpers/users_helper.rb
Outdated
| @@ -0,0 +1,15 @@ | |||
| module UsersHelper | |||
| def list_gardens_on_show? | |||
| has_non_default_garden?(@user) || authorized_for?(@user) | |||
There was a problem hiding this comment.
Use 2 (not 4) spaces for indentation.
| @@ -0,0 +1,15 @@ | |||
| module UsersHelper | |||
There was a problem hiding this comment.
Missing magic comment # frozen_string_literal: true.
chrislabarge
force-pushed
the
fix/users_show
branch
from
840b04a to
1d7346e
Compare
chrislabarge
force-pushed
the
fix/users_show
branch
from
1d7346e to
1e21d4d
Compare
|
I don't believe any of the errors on Travis are a result from my code, as they are all showing up on my local master branch as well. Please correct me if I am wrong. :) |
|
@chrislabarge can you merge in the latest gem file fixes.? |
| end | ||
|
|
||
| def has_non_default_garden?(user) | ||
| user.gardens.each { |garden| return true unless garden.user_default?} |
There was a problem hiding this comment.
that line can be this way? user.gardens.none?(&:user_default?)
|
Closing this PR due to inactivity, although it appears that RSpec is working again after upgrades. Sorry for the radio silence on this one- I'm hoping to take a more active role in getting things merged in 2019. Please let me know if there is anything I can do to help- I realize it has been very quiet these days. |
User UI improvements (fixes?) #950
Added some user feature specs to show desired logic.