Publish event creates a copy of the event

* Instead of creating a PublishedArticle, a copy of the event is created. PS: depends of cba6c4326. (ActionItem1648)

Publish event creates a copy of the event
* Instead of creating a PublishedArticle, a copy of the event is created. PS: depends of cba6c4326. (ActionItem1648)
Rodrigo Souto · Antonio Terceiro
1 parent 24a8cc1e
Showing 6 changed files with 48 additions and 20 deletions Show diff stats
app/models/approve_article.rb
app/models/article.rb
app/models/event.rb
app/views/cms/publish.rhtml
features/events.feature
test/functional/cms_controller_test.rb
@@ -64,7 +64,11 @@ class ApproveArticle &lt; Task
   end
   def perform
-    PublishedArticle.create!(:name => name, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)
+    if article.event?
+      article.copy(:name => name, :profile => target, :reference_article => article)
+    else
+      PublishedArticle.create!(:name => name, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source)
+    end
   end
   def target_notification_message
@@ -274,7 +274,7 @@ class Article &lt; ActiveRecord::Base
   end
-  def copy(options)
+  def copy(options = {})
     attrs = attributes.reject! { |key, value| ATTRIBUTES_NOT_COPIED.include?(key.to_sym) }
     attrs.merge!(options)
     self.class.create(attrs)
@@ -317,6 +317,10 @@ class Article &lt; ActiveRecord::Base
     false
   end
+  def event?
+    false
+  end
+
   def display_as_gallery?
     false
   end
@@ -127,6 +127,10 @@ class Event &lt; Article
     maybe_add_http(self.body[:link])
   end
+  def event?
+    true
+  end
+
   include MaybeAddHttp
 end
@@ -14,24 +14,15 @@
   </div>
 <% end %>
+<% form_tag do%>
+  <%= hidden_field_tag :back_to, @back_to %>
+  <% @groups.each do |group| %>
+    <%= labelled_check_box group.name, "marked_groups[#{group.id}][group_id]", group.id, @marked_groups.include?(group) %><br />
+    <%= labelled_text_field _('Title') + ': ', "marked_groups[#{group.id}][name]", @article.name, :style => 'width: 100%' %>
+    <hr />
+  <% end %>
-<!-- Workaroud while the publish feature isn't ready for Events -->
-<% unless @article.is_a?(Event) %>
-  <% form_tag do%>
-    <%= hidden_field_tag :back_to, @back_to %>
-    <% @groups.each do |group| %>
-      <%= labelled_check_box group.name, "marked_groups[#{group.id}][group_id]", group.id, @marked_groups.include?(group) %><br />
-      <%= labelled_text_field _('Title') + ': ', "marked_groups[#{group.id}][name]", @article.name, :style => 'width: 100%' %>
-      <hr />
-    <% end %>
-
-    <% button_bar do %>
-      <%= submit_button 'spread', _('Spread this'), :cancel => @back_to %>
-    <% end %>
+  <% button_bar do %>
+    <%= submit_button 'spread', _('Spread this'), :cancel => @back_to %>
   <% end %>
-<% else %>
-  <div class='atention'>
-    <%= _("This option is temporarily disabled.") %>
-  </div>
 <% end %>
-
@@ -170,3 +170,18 @@ Feature: events
   Scenario: display environment name in global agenda
     When I am on /assets/events
     Then I should see "Colivre.net's events"
+
+  Scenario: published events should be listed in the agenda too
+    Given the following community
+      | identifier | name |
+      | sample-community | Sample Community |
+    And I am logged in as "josesilva"
+    And "josesilva" is a member of "Sample Community"
+    And I am on josesilva's control panel
+    And I follow "Manage content"
+    And I follow "Another Conference"
+    And I follow "Spread"
+    And I check "Sample Community"
+    And I press "Spread this"
+    And I am on /profile/sample-community/events/2009/10/24
+    Then I should see "Another Conference"
@@ -684,6 +684,16 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     end
   end
+  should 'create a new event after publishing an event' do
+    c = fast_create(Community)
+    c.affiliate(profile, Profile::Roles.all_roles(c.environment.id))
+    a = Event.create!(:name => "Some event", :profile => profile, :start_date => Date.today)
+
+    assert_difference Event, :count do
+      post :publish, :profile => profile.identifier, :id => a.id, :marked_groups => {c.id.to_s => {:name => 'bli', :group_id => c.id.to_s}}
+    end
+  end
+
   should "not crash if there is a post and no portal community defined" do
     Environment.any_instance.stubs(:portal_community).returns(nil)
     article = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')
	@@ -14,24 +14,15 @@		@@ -14,24 +14,15 @@
14	</div>	14	</div>
15	<% end %>	15	<% end %>
16		16
		17	+<% form_tag do%>
		18	+ <%= hidden_field_tag :back_to, @back_to %>
		19	+ <% @groups.each do \|group\| %>
		20	+ <%= labelled_check_box group.name, "marked_groups[#{group.id}][group_id]", group.id, @marked_groups.include?(group) %><br />
		21	+ <%= labelled_text_field _('Title') + ': ', "marked_groups[#{group.id}][name]", @article.name, :style => 'width: 100%' %>
		22	+ <hr />
		23	+ <% end %>
17		24
18	-<!-- Workaroud while the publish feature isn't ready for Events -->
19	-<% unless @article.is_a?(Event) %>
20	- <% form_tag do%>
21	- <%= hidden_field_tag :back_to, @back_to %>
22	- <% @groups.each do \|group\| %>
23	- <%= labelled_check_box group.name, "marked_groups[#{group.id}][group_id]", group.id, @marked_groups.include?(group) %><br />
24	- <%= labelled_text_field _('Title') + ': ', "marked_groups[#{group.id}][name]", @article.name, :style => 'width: 100%' %>
25	- <hr />
26	- <% end %>
27	-
28	- <% button_bar do %>
29	- <%= submit_button 'spread', _('Spread this'), :cancel => @back_to %>
30	- <% end %>	25	+ <% button_bar do %>
		26	+ <%= submit_button 'spread', _('Spread this'), :cancel => @back_to %>
31	<% end %>	27	<% end %>
32	-<% else %>
33	- <div class='atention'>
34	- <%= _("This option is temporarily disabled.") %>
35	- </div>
36	<% end %>	28	<% end %>
37	-
	@@ -170,3 +170,18 @@ Feature: events		@@ -170,3 +170,18 @@ Feature: events
170	Scenario: display environment name in global agenda	170	Scenario: display environment name in global agenda
171	When I am on /assets/events	171	When I am on /assets/events
172	Then I should see "Colivre.net's events"	172	Then I should see "Colivre.net's events"
		173	+
		174	+ Scenario: published events should be listed in the agenda too
		175	+ Given the following community
		176	+ \| identifier \| name \|
		177	+ \| sample-community \| Sample Community \|
		178	+ And I am logged in as "josesilva"
		179	+ And "josesilva" is a member of "Sample Community"
		180	+ And I am on josesilva's control panel
		181	+ And I follow "Manage content"
		182	+ And I follow "Another Conference"
		183	+ And I follow "Spread"
		184	+ And I check "Sample Community"
		185	+ And I press "Spread this"
		186	+ And I am on /profile/sample-community/events/2009/10/24
		187	+ Then I should see "Another Conference"
	@@ -684,6 +684,16 @@ class CmsControllerTest < Test::Unit::TestCase		@@ -684,6 +684,16 @@ class CmsControllerTest < Test::Unit::TestCase
684	end	684	end
685	end	685	end
686		686
		687	+ should 'create a new event after publishing an event' do
		688	+ c = fast_create(Community)
		689	+ c.affiliate(profile, Profile::Roles.all_roles(c.environment.id))
		690	+ a = Event.create!(:name => "Some event", :profile => profile, :start_date => Date.today)
		691	+
		692	+ assert_difference Event, :count do
		693	+ post :publish, :profile => profile.identifier, :id => a.id, :marked_groups => {c.id.to_s => {:name => 'bli', :group_id => c.id.to_s}}
		694	+ end
		695	+ end
		696	+
687	should "not crash if there is a post and no portal community defined" do	697	should "not crash if there is a post and no portal community defined" do
688	Environment.any_instance.stubs(:portal_community).returns(nil)	698	Environment.any_instance.stubs(:portal_community).returns(nil)
689	article = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')	699	article = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')