diff options
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/aspect_global_helper.rb | 15 | ||||
-rw-r--r-- | app/helpers/interim_stream_hackiness_helper.rb | 4 | ||||
-rw-r--r-- | app/helpers/publisher_helper.rb | 4 |
3 files changed, 13 insertions, 10 deletions
diff --git a/app/helpers/aspect_global_helper.rb b/app/helpers/aspect_global_helper.rb index 421215b7d..d495072d9 100644 --- a/app/helpers/aspect_global_helper.rb +++ b/app/helpers/aspect_global_helper.rb @@ -17,13 +17,24 @@ module AspectGlobalHelper aspect = stream.aspect aspect_ids = stream.aspect_ids elsif current_user - aspects = current_user.aspects + aspects = current_user.post_default_aspects aspect = aspects.first aspect_ids = current_user.aspect_ids else return {} end + {selected_aspects: aspects, aspect: aspect, aspect_ids: aspect_ids} + end + + def public_selected?(selected_aspects) + "public" == selected_aspects.try(:first) + end + + def all_aspects_selected?(aspects, selected_aspects) + !aspects.empty? && aspects.size == selected_aspects.size && !public_selected?(selected_aspects) + end - { selected_aspects: aspects, aspect: aspect, aspect_ids: aspect_ids } + def aspect_selected?(aspect, aspects, selected_aspects) + selected_aspects.include?(aspect) && !all_aspects_selected?(aspects, selected_aspects) end end diff --git a/app/helpers/interim_stream_hackiness_helper.rb b/app/helpers/interim_stream_hackiness_helper.rb index c5d6992ab..78a893143 100644 --- a/app/helpers/interim_stream_hackiness_helper.rb +++ b/app/helpers/interim_stream_hackiness_helper.rb @@ -46,8 +46,4 @@ module InterimStreamHackinessHelper def publisher_open publisher_method(:open) end - - def publisher_public - publisher_method(:public) - end end diff --git a/app/helpers/publisher_helper.rb b/app/helpers/publisher_helper.rb index 1e7e326a9..ba4bc1d37 100644 --- a/app/helpers/publisher_helper.rb +++ b/app/helpers/publisher_helper.rb @@ -7,10 +7,6 @@ module PublisherHelper params[:controller] != "tags" end - def all_aspects_selected?(selected_aspects) - @all_aspects_selected ||= all_aspects.size == selected_aspects.size - end - def service_button(service) provider_title = I18n.t( "services.index.share_to", |