Download as
Browse Code »

Commit b041998d66aaf2a2542a4aee5420dcf9cd95e7cb

Authored by Rodrigo Souto
Committed by Antonio Terceiro
1 parent 7e15d0cb
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Events are displayed only if the user is allowed to see it 

(ActionItem1646)
Showing 2 changed files with 19 additions and 2 deletions   Show diff stats
app/helpers/events_helper.rb
  Diff comments   View file @b041998
... ... @@ -6,7 +6,7 @@ module EventsHelper
6 6 content_tag('h2', title) +
7 7 content_tag('div',
8 8 (events.any? ?
9   - content_tag('table', events.select { |item| item.public? }.map {|item| display_event_in_listing(item)}.join('')) :
  9 + content_tag('table', events.select { |item| item.display_to?(user) }.map {|item| display_event_in_listing(item)}.join('')) :
10 10 content_tag('em', _('No events for this date'), :class => 'no-events')
11 11 ), :id => 'agenda-items'
12 12 )
... ... @@ -26,7 +26,7 @@ module EventsHelper
26 26 # the day itself
27 27 date,
28 28 # is there any events in this date?
29   - events.any? do |event|
  29 + events.select {|event| event.display_to?(user)}.any? do |event|
30 30 event.date_range.include?(date)
31 31 end,
32 32 # is this date in the current month?
... ...
features/events.feature
  Diff comments   View file @b041998
... ... @@ -185,3 +185,20 @@ Feature: events
185 185 And I press "Spread this"
186 186 And I am on /profile/sample-community/events/2009/10/24
187 187 Then I should see "Another Conference"
  188 +
  189 + Scenario: events that are not allowed to the user should not be displayed nor listed in the calendar
  190 + Given the following events
  191 + | owner | name | start_date | published |
  192 + | josesilva | Unpublished event | 2009-10-25 | false |
  193 + When I am on /profile/josesilva/events/2009/10/25
  194 + Then I should not see "Unpublished event"
  195 + And I should not see "25" link
  196 +
  197 + Scenario: events that are allowed to the user should be displayed and listed in the calendar
  198 + Given the following events
  199 + | owner | name | start_date | published |
  200 + | josesilva | Unpublished event | 2009-10-25 | false |
  201 + And I am logged in as "josesilva"
  202 + When I am on /profile/josesilva/events/2009/10/25
  203 + Then I should see "Unpublished event"
  204 + And I should see "25" link
... ...