Merge branch 'master' of beta.softwarepublico.gov.br:softwarepublico/softwarepublico

Athos
2 parents 4fc3afb2 e6f69622
Showing 3 changed files with 28 additions and 9 deletions Show diff stats
src/noosfero-spb/software_communities/lib/software_events_block.rb
src/noosfero-spb/software_communities/test/unit/software_events_block_test.rb
src/noosfero-spb/software_communities/views/blocks/software_events.html.erb
@@ -8,6 +8,10 @@ class SoftwareEventsBlock &lt; Block
     _('This block displays the software community events in a list.')
   end
  
+  def default_title
+    _('Other events')
+  end
+
   def content(args={})
     block = self
  
@@ -34,8 +38,8 @@ class SoftwareEventsBlock &lt; Block
     get_events.where("slug NOT IN (?)", event_slug)
   end
  
-  def has_events_to_display?
-    not get_events.empty?
+  def has_events_to_display? current_event_slug=""
+    not get_events_except(current_event_slug).empty?
   end
  
   def should_display_title?
@@ -46,12 +46,22 @@ class SoftwareEventsBlockTest &lt; ActiveSupport::TestCase
   should "tell if there are events to be displayed" do
     assert_equal true, @software_events_block.has_events_to_display?
  
-    @community.events.update_all :start_date => (DateTime.now - 2.days),
-                                 :end_date => (DateTime.now - 1.day)
+    update_all_events (DateTime.now - 2.days), (DateTime.now - 1.day)
  
     assert_equal false, @software_events_block.has_events_to_display?
   end
  
+  should "tell if there are events to be displayed when given a event page slug" do
+    update_all_events (DateTime.now - 2.days), (DateTime.now - 1.day)
+
+    last_event = @community.events.last
+    last_event.end_date = DateTime.now + 10.days
+    last_event.save!
+
+    assert_equal true, @software_events_block.has_events_to_display?
+    assert_equal false, @software_events_block.has_events_to_display?(last_event.slug)
+  end
+
   should "tell that the block must show the title in other areas that are no the main area" do
     assert_equal false, @software_events_block.should_display_title?
  
@@ -60,4 +70,10 @@ class SoftwareEventsBlockTest &lt; ActiveSupport::TestCase
  
     assert_equal true, @software_events_block.should_display_title?
   end
+
+  private
+
+    def update_all_events start_date, end_date
+      @community.events.update_all :start_date => start_date, :end_date => end_date
+    end
 end
-<div class="software-community-events-block">
-  <% if block.has_events_to_display? %>
+<% if block.has_events_to_display? params[:page] %>
+  <div class="software-community-events-block">
     <ul class="software-community-events-list">
-
       <% if block.should_display_title? %>
         <li class="software-events-list-item">
           <span class="software-events-list-item-title">
@@ -18,5 +17,5 @@
       <% end %>
  
     </ul>
-  <% end %>
-</div>
+  </div>
+<% end %>
...	...	@@ -8,6 +8,10 @@ class SoftwareEventsBlock < Block
8	8	_('This block displays the software community events in a list.')
9	9	end
10	10
	11	+ def default_title
	12	+ _('Other events')
	13	+ end
	14	+
11	15	def content(args={})
12	16	block = self
13	17
...	...	@@ -34,8 +38,8 @@ class SoftwareEventsBlock < Block
34	38	get_events.where("slug NOT IN (?)", event_slug)
35	39	end
36	40
37		- def has_events_to_display?
38		- not get_events.empty?
	41	+ def has_events_to_display? current_event_slug=""
	42	+ not get_events_except(current_event_slug).empty?
39	43	end
40	44
41	45	def should_display_title?
...	...
...	...	@@ -46,12 +46,22 @@ class SoftwareEventsBlockTest < ActiveSupport::TestCase
46	46	should "tell if there are events to be displayed" do
47	47	assert_equal true, @software_events_block.has_events_to_display?
48	48
49		- @community.events.update_all :start_date => (DateTime.now - 2.days),
50		- :end_date => (DateTime.now - 1.day)
	49	+ update_all_events (DateTime.now - 2.days), (DateTime.now - 1.day)
51	50
52	51	assert_equal false, @software_events_block.has_events_to_display?
53	52	end
54	53
	54	+ should "tell if there are events to be displayed when given a event page slug" do
	55	+ update_all_events (DateTime.now - 2.days), (DateTime.now - 1.day)
	56	+
	57	+ last_event = @community.events.last
	58	+ last_event.end_date = DateTime.now + 10.days
	59	+ last_event.save!
	60	+
	61	+ assert_equal true, @software_events_block.has_events_to_display?
	62	+ assert_equal false, @software_events_block.has_events_to_display?(last_event.slug)
	63	+ end
	64	+
55	65	should "tell that the block must show the title in other areas that are no the main area" do
56	66	assert_equal false, @software_events_block.should_display_title?
57	67
...	...	@@ -60,4 +70,10 @@ class SoftwareEventsBlockTest < ActiveSupport::TestCase
60	70
61	71	assert_equal true, @software_events_block.should_display_title?
62	72	end
	73	+
	74	+ private
	75	+
	76	+ def update_all_events start_date, end_date
	77	+ @community.events.update_all :start_date => start_date, :end_date => end_date
	78	+ end
63	79	end
...	...
1		-<div class="software-community-events-block">
2		- <% if block.has_events_to_display? %>
	1	+<% if block.has_events_to_display? params[:page] %>
	2	+ <div class="software-community-events-block">
3	3	<ul class="software-community-events-list">
4		-
5	4	<% if block.should_display_title? %>
6	5	<li class="software-events-list-item">
7	6	<span class="software-events-list-item-title">
...	...	@@ -18,5 +17,5 @@
18	17	<% end %>
19	18
20	19	</ul>
21		- <% end %>
22		-</div>
	20	+ </div>
	21	+<% end %>
...	...