Can approve creation of communities with images

Adding explanation about moderation ActionItem1254

Can approve creation of communities with images
Adding explanation about moderation ActionItem1254
Daniela Feitosa · Antonio Terceiro
1 parent bf95a1cf
Showing 4 changed files with 44 additions and 4 deletions Show diff stats
app/models/create_community.rb
app/views/memberships/new_community.rhtml
app/views/tasks/_create_community.rhtml
test/unit/create_community_test.rb
@@ -12,7 +12,9 @@ class CreateCommunity &lt; Task
     self[:data] ||= Hash.new
   end
-  DATA_FIELDS = Community.fields + ['name', 'closed', 'image_builder', 'tag_list']
+  acts_as_having_image
+
+  DATA_FIELDS = Community.fields + ['name', 'closed', 'tag_list']
   DATA_FIELDS.each do |field|
     # getter
@@ -40,6 +42,7 @@ class CreateCommunity &lt; Task
     end
     community.update_attributes(community_data)
+    community.image = image if image
     community.environment = self.environment
     community.save!
     community.add_admin(self.requestor)
@@ -4,6 +4,12 @@
 <h1><%= __('Creating new community') %></h1>
+<% if environment.enabled?('admin_must_approve_new_communities') %>
+  <div class='explanation'>
+    <%= _("Your request for registering a community will be sent to %{environment} administrator and will be approved or rejected according to his methods and creteria.") % { :environment => environment.name }%>
+  </div>
+<%end %>
+
 <%= error_messages_for :community %>
 <div>
@@ -14,17 +14,30 @@
       <%= hidden_field_tag(:decision, 'cancel') %>
     <% else %>
       <%= radio_button_tag(:decision, 'finish', true,
-          :id => "decision-finish-#{task.id}") %>
+                           :id => "decision-finish-#{task.id}",
+                           :onclick => "hide_closing_statement_area(#{task.id})") %>
           <label for="<%= "decision-finish-#{task.id}" %>"><b><%= _('Approve') %></b></label>
       &nbsp; &nbsp;
       <%= radio_button_tag(:decision, 'cancel', false,
-          :id => "decision-cancel-#{task.id}") %>
+                           :id => "decision-cancel-#{task.id}",
+                           :onclick => "show_closing_statement_area(#{task.id})") %>
       <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Reject') %></b></label>
     <% end %>
+    <script type='text/javascript'>
+      function show_closing_statement_area(id) {
+        $('task-closing-statement-' + id).show();
+      }
+      function hide_closing_statement_area(id) {
+        $('task-closing-statement-' + id).hide();
+      }
+    </script>
+
+    <div style='display:none' id=<%= "task-closing-statement-#{task.id}" %>  >
       <%= labelled_form_field _('Please provide an explanation for the rejection'), f.text_area(:closing_statement, :style => 'height:200px; width:80%;') %>
+    </div>
   </div>
@@ -10,7 +10,7 @@ class CreateCommunityTest &lt; Test::Unit::TestCase
   should 'provide needed data' do
     task = CreateCommunity.new
-    Community.fields + %w[ name closed image_builder tag_list ].each do |field|
+    Community.fields + %w[ name closed tag_list ].each do |field|
       assert task.respond_to?(field)
       assert task.respond_to?("#{field}=")
     end
@@ -65,4 +65,22 @@ class CreateCommunityTest &lt; Test::Unit::TestCase
     request.stubs(:status).returns(Task::Status::CANCELLED)
     assert request.rejected?
   end
+
+  should 'create a community with image when finishing the task' do
+
+    task = CreateCommunity.create!({
+      :name => 'My new community',
+      :requestor => person,
+      :target => Environment.default,
+      :image_builder => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')}
+    })
+
+    assert_equal 'rails.png', task.image.filename
+    assert_difference Community, :count do
+      task.finish
+    end
+
+    assert_equal 'rails.png', Community['my-new-community'].image.filename
+  end
+
 end
	@@ -4,6 +4,12 @@		@@ -4,6 +4,12 @@
4		4
5	<h1><%= __('Creating new community') %></h1>	5	<h1><%= __('Creating new community') %></h1>
6		6
		7	+<% if environment.enabled?('admin_must_approve_new_communities') %>
		8	+ <div class='explanation'>
		9	+ <%= _("Your request for registering a community will be sent to %{environment} administrator and will be approved or rejected according to his methods and creteria.") % { :environment => environment.name }%>
		10	+ </div>
		11	+<%end %>
		12	+
7	<%= error_messages_for :community %>	13	<%= error_messages_for :community %>
8		14
9	<div>	15	<div>
	@@ -10,7 +10,7 @@ class CreateCommunityTest < Test::Unit::TestCase		@@ -10,7 +10,7 @@ class CreateCommunityTest < Test::Unit::TestCase
10	should 'provide needed data' do	10	should 'provide needed data' do
11	task = CreateCommunity.new	11	task = CreateCommunity.new
12		12
13	- Community.fields + %w[ name closed image_builder tag_list ].each do \|field\|	13	+ Community.fields + %w[ name closed tag_list ].each do \|field\|
14	assert task.respond_to?(field)	14	assert task.respond_to?(field)
15	assert task.respond_to?("#{field}=")	15	assert task.respond_to?("#{field}=")
16	end	16	end
	@@ -65,4 +65,22 @@ class CreateCommunityTest < Test::Unit::TestCase		@@ -65,4 +65,22 @@ class CreateCommunityTest < Test::Unit::TestCase
65	request.stubs(:status).returns(Task::Status::CANCELLED)	65	request.stubs(:status).returns(Task::Status::CANCELLED)
66	assert request.rejected?	66	assert request.rejected?
67	end	67	end
		68	+
		69	+ should 'create a community with image when finishing the task' do
		70	+
		71	+ task = CreateCommunity.create!({
		72	+ :name => 'My new community',
		73	+ :requestor => person,
		74	+ :target => Environment.default,
		75	+ :image_builder => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')}
		76	+ })
		77	+
		78	+ assert_equal 'rails.png', task.image.filename
		79	+ assert_difference Community, :count do
		80	+ task.finish
		81	+ end
		82	+
		83	+ assert_equal 'rails.png', Community['my-new-community'].image.filename
		84	+ end
		85	+
68	end	86	end