Accept article suggestion from logged in users

Victor Costa
1 parent b3756e14
Showing 7 changed files with 74 additions and 11 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/models/suggest_article.rb
app/views/cms/suggest_an_article.html.erb
app/views/tasks/_suggest_article_accept_details.html.erb
test/functional/cms_controller_test.rb
test/functional/tasks_controller_test.rb
test/unit/suggest_article_test.rb
@@ -357,6 +357,7 @@ class CmsController &lt; MyProfileController
       @task.ip_address = request.remote_ip
       @task.user_agent = request.user_agent
       @task.referrer = request.referrer
+      @task.requestor = current_person if logged_in?
       if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
         session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
         redirect_to @back_to
 class SuggestArticle < Task
-  validates_presence_of :target_id, :article_name, :email, :name, :article_body
+  validates_presence_of :target_id, :article_name, :article_body
+  validates_presence_of :email, :name, :if => Proc.new { |task| task.requestor.blank? }
   settings_items :email, :type => String
   settings_items :name, :type => String
@@ -24,7 +25,7 @@ class SuggestArticle &lt; Task
   include Noosfero::Plugin::HotSpot
   def sender
-    "#{name} (#{email})"
+    requestor ? "#{requestor.name}" : "#{name} (#{email})"
   end
   def perform
@@ -50,8 +51,9 @@ class SuggestArticle &lt; Task
   end
   def information
-    { :message => _('%{sender} suggested the publication of the article: %{subject}.'),
-      :variables => {:sender => sender} }
+    variables = requestor.blank? ? {:requestor => sender} : {}
+    { :message => _('%{requestor} suggested the publication of the article: %{subject}.'),
+      :variables => variables }
   end
   def accept_details
@@ -63,8 +65,8 @@ class SuggestArticle &lt; Task
   end
   def target_notification_description
-    _('%{sender} suggested the publication of the article: %{article}.') %
-    {:sender => sender, :article => article_name}
+    _('%{requestor} suggested the publication of the article: %{article}.') %
+    {:requestor => sender, :article => article_name}
   end
   def target_notification_message
@@ -12,9 +12,10 @@
   <%= labelled_form_field(_('Source URL'), text_field(:task, 'source')) %>
-  <%= required labelled_form_field(_('Your name'), text_field(:task, 'name')) %>
-
-  <%= required labelled_form_field(_('Email'), text_field(:task, 'email')) %>
+  <% unless logged_in? %>
+    <%= required labelled_form_field(_('Your name'), text_field(:task, 'name')) %>
+    <%= required labelled_form_field(_('Email'), text_field(:task, 'email')) %>
+  <% end %>
   <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => :task, :abstract_method => 'article_abstract', :body_method => 'article_body'} %>
 <%= render :file => 'shared/tiny_mce' %>
-<%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
-<p><%= label_tag(_("Email: %s") % task.email) %> </p>
+<% unless task.requestor %>
+  <%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
+  <p><%= label_tag(_("Email: %s") % task.email) %> </p>
+<% end %>
 <%= required labelled_form_field(_('Title'), f.text_field(:article_name, :size => 50)) %>
 <%= labelled_form_field(_('Source'), f.text_field(:source_name)) %>
 <%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>
@@ -1407,6 +1407,21 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_template 'suggest_an_article'
   end
+  should 'display name and email when a not logged in user suggest an article' do
+    logout
+    get :suggest_an_article, :profile => profile.identifier, :back_to => 'action_view'
+
+    assert_select '#task_name'
+    assert_select '#task_email'
+  end
+
+  should 'do not display name and email when a logged in user suggest an article' do
+    get :suggest_an_article, :profile => profile.identifier, :back_to => 'action_view'
+
+    assert_select '#task_name', 0
+    assert_select '#task_email', 0
+  end
+
   should 'render TinyMce Editor on suggestion of article' do
     logout
     get :suggest_an_article, :profile => profile.identifier
@@ -1423,6 +1438,13 @@ class CmsControllerTest &lt; ActionController::TestCase
     end
   end
+  should 'create suggest task with logged in user as the article author' do
+    c = Community.create!(:name => 'test comm', :identifier => 'test_comm', :moderated_articles => true)
+
+    post :suggest_an_article, :profile => c.identifier, :back_to => 'action_view', :task => {:article_name => 'some name', :article_body => 'some body'}
+    assert_equal profile, SuggestArticle.last.requestor
+  end
+
   should 'suggest an article from a profile' do
     c = Community.create!(:name => 'test comm', :identifier => 'test_comm', :moderated_articles => true)
     get :suggest_an_article, :profile => c.identifier, :back_to => c.identifier
@@ -305,6 +305,28 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_equal 'new source', TinyMceArticle.find(:first).source_name
   end
+  should "display name from article suggestion when requestor was not setted" do
+    Task.destroy_all
+    c = fast_create(Community)
+    c.add_admin profile
+    @controller.stubs(:profile).returns(c)
+    t = SuggestArticle.create!(:article_name => 'test name', :article_abstract => 'test abstract', :article_body => 'test body', :name => 'some name', :email => 'test@localhost.com', :target => c)
+
+    get :index
+    assert_select "#tasks_#{t.id}_task_name"
+  end
+
+  should "not display name from article suggestion when requestor was setted" do
+    Task.destroy_all
+    c = fast_create(Community)
+    c.add_admin profile
+    @controller.stubs(:profile).returns(c)
+    t = SuggestArticle.create!(:article_name => 'test name', :article_abstract => 'test abstract', :article_body => 'test body', :requestor => fast_create(Person), :target => c)
+
+    get :index
+    assert_select "#tasks_#{t.id}_task_name", 0
+  end
+
   should "not crash if accessing close without tasks parameter" do
     assert_nothing_raised do
       post :close
@@ -225,4 +225,17 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
     assert_match "SuggestArticle-id: #{t.id} IP: 192.168.0.1", log.read
   end
+  should 'not require name and email when requestor is present' do
+    t = SuggestArticle.new(:requestor => fast_create(Person))
+    t.valid?
+    assert t.errors[:email].blank?
+    assert t.errors[:name].blank?
+  end
+
+  should 'return name as sender when requestor is setted' do
+    person = fast_create(Person)
+    t = SuggestArticle.new(:requestor => person)
+    assert_equal person.name, t.sender
+  end
+
 end
	@@ -1407,6 +1407,21 @@ class CmsControllerTest < ActionController::TestCase		@@ -1407,6 +1407,21 @@ class CmsControllerTest < ActionController::TestCase
1407	assert_template 'suggest_an_article'	1407	assert_template 'suggest_an_article'
1408	end	1408	end
1409		1409
		1410	+ should 'display name and email when a not logged in user suggest an article' do
		1411	+ logout
		1412	+ get :suggest_an_article, :profile => profile.identifier, :back_to => 'action_view'
		1413	+
		1414	+ assert_select '#task_name'
		1415	+ assert_select '#task_email'
		1416	+ end
		1417	+
		1418	+ should 'do not display name and email when a logged in user suggest an article' do
		1419	+ get :suggest_an_article, :profile => profile.identifier, :back_to => 'action_view'
		1420	+
		1421	+ assert_select '#task_name', 0
		1422	+ assert_select '#task_email', 0
		1423	+ end
		1424	+
1410	should 'render TinyMce Editor on suggestion of article' do	1425	should 'render TinyMce Editor on suggestion of article' do
1411	logout	1426	logout
1412	get :suggest_an_article, :profile => profile.identifier	1427	get :suggest_an_article, :profile => profile.identifier
	@@ -1423,6 +1438,13 @@ class CmsControllerTest < ActionController::TestCase		@@ -1423,6 +1438,13 @@ class CmsControllerTest < ActionController::TestCase
1423	end	1438	end
1424	end	1439	end
1425		1440
		1441	+ should 'create suggest task with logged in user as the article author' do
		1442	+ c = Community.create!(:name => 'test comm', :identifier => 'test_comm', :moderated_articles => true)
		1443	+
		1444	+ post :suggest_an_article, :profile => c.identifier, :back_to => 'action_view', :task => {:article_name => 'some name', :article_body => 'some body'}
		1445	+ assert_equal profile, SuggestArticle.last.requestor
		1446	+ end
		1447	+
1426	should 'suggest an article from a profile' do	1448	should 'suggest an article from a profile' do
1427	c = Community.create!(:name => 'test comm', :identifier => 'test_comm', :moderated_articles => true)	1449	c = Community.create!(:name => 'test comm', :identifier => 'test_comm', :moderated_articles => true)
1428	get :suggest_an_article, :profile => c.identifier, :back_to => c.identifier	1450	get :suggest_an_article, :profile => c.identifier, :back_to => c.identifier
	@@ -305,6 +305,28 @@ class TasksControllerTest < ActionController::TestCase		@@ -305,6 +305,28 @@ class TasksControllerTest < ActionController::TestCase
305	assert_equal 'new source', TinyMceArticle.find(:first).source_name	305	assert_equal 'new source', TinyMceArticle.find(:first).source_name
306	end	306	end
307		307
		308	+ should "display name from article suggestion when requestor was not setted" do
		309	+ Task.destroy_all
		310	+ c = fast_create(Community)
		311	+ c.add_admin profile
		312	+ @controller.stubs(:profile).returns(c)
		313	+ t = SuggestArticle.create!(:article_name => 'test name', :article_abstract => 'test abstract', :article_body => 'test body', :name => 'some name', :email => 'test@localhost.com', :target => c)
		314	+
		315	+ get :index
		316	+ assert_select "#tasks_#{t.id}_task_name"
		317	+ end
		318	+
		319	+ should "not display name from article suggestion when requestor was setted" do
		320	+ Task.destroy_all
		321	+ c = fast_create(Community)
		322	+ c.add_admin profile
		323	+ @controller.stubs(:profile).returns(c)
		324	+ t = SuggestArticle.create!(:article_name => 'test name', :article_abstract => 'test abstract', :article_body => 'test body', :requestor => fast_create(Person), :target => c)
		325	+
		326	+ get :index
		327	+ assert_select "#tasks_#{t.id}_task_name", 0
		328	+ end
		329	+
308	should "not crash if accessing close without tasks parameter" do	330	should "not crash if accessing close without tasks parameter" do
309	assert_nothing_raised do	331	assert_nothing_raised do
310	post :close	332	post :close
	@@ -225,4 +225,17 @@ class SuggestArticleTest < ActiveSupport::TestCase		@@ -225,4 +225,17 @@ class SuggestArticleTest < ActiveSupport::TestCase
225	assert_match "SuggestArticle-id: #{t.id} IP: 192.168.0.1", log.read	225	assert_match "SuggestArticle-id: #{t.id} IP: 192.168.0.1", log.read
226	end	226	end
227		227
		228	+ should 'not require name and email when requestor is present' do
		229	+ t = SuggestArticle.new(:requestor => fast_create(Person))
		230	+ t.valid?
		231	+ assert t.errors[:email].blank?
		232	+ assert t.errors[:name].blank?
		233	+ end
		234	+
		235	+ should 'return name as sender when requestor is setted' do
		236	+ person = fast_create(Person)
		237	+ t = SuggestArticle.new(:requestor => person)
		238	+ assert_equal person.name, t.sender
		239	+ end
		240	+
228	end	241	end