forum_use_terms: add user term to forums

(ActionItem2513) Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Tales Martins <tales.martins@gmail.com> Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

forum_use_terms: add user term to forums
(ActionItem2513) Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Tales Martins <tales.martins@gmail.com> Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Arthur Del Esposte · Daniela Feitosa
1 parent 161785bd
Showing 11 changed files with 184 additions and 21 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/public/content_viewer_controller.rb
app/models/forum.rb
app/models/person.rb
app/views/cms/_forum.rhtml
app/views/content_viewer/_terms_of_use.rhtml
app/views/content_viewer/forum_page.rhtml
db/migrate/20131128161159_terms_forum_people.rb
features/forum.feature
public/javascripts/application.js
test/functional/cms_controller_test.rb
@@ -74,6 +74,8 @@ class CmsController &lt; MyProfileController
     record_coming
     if request.post?
       @article.image = nil if params[:remove_image] == 'true'
+      @article.users_with_agreement.clear if (@article.forum? and params[:article][:has_terms_of_use] == "0")
+      @article.users_with_agreement << user if (@article.forum? and params[:article][:has_terms_of_use] == "1" and !@article.users_with_agreement.include? user) 
       @article.last_changed_by = user
       if @article.update_attributes(params[:article])
         if !continue
@@ -130,6 +132,7 @@ class CmsController &lt; MyProfileController
     continue = params[:continue]
     if request.post?
+      @article.users_with_agreement << user if (@article.forum? and params[:article][:has_terms_of_use] == "1")
       if @article.save
         if continue
           redirect_to :action => 'edit', :id => @article
@@ -387,4 +390,3 @@ class CmsController &lt; MyProfileController
   end
 end
-
@@ -50,6 +50,17 @@ class ContentViewerController &lt; ApplicationController
     redirect_to_translation if @page.profile.redirect_l10n
+    if request.post?
+      if @page.forum? && @page.has_terms_of_use && params[:terms_accepted] == "true"
+        @page.add_agreed_user(user)
+      end
+    elsif !@page.parent.nil? && @page.parent.forum?
+      unless @page.parent.agrees_with_terms?(user)
+        params[:page].pop
+        redirect_to :profile => params[:profile], :page => params[:page], :action => 'view_page'
+      end
+    end
+
     # At this point the page will be showed
     @page.hit
@@ -3,6 +3,10 @@ class Forum &lt; Folder
   acts_as_having_posts :order => 'updated_at DESC'
   include PostsLimit
+  settings_items :terms_of_use, :type => :string, :default => ""
+  settings_items :has_terms_of_use, :type => :boolean, :default => false
+  has_and_belongs_to_many :users_with_agreement, :class_name => 'Person', :join_table => 'terms_forum_people'
+
   def self.type_name
     _('Forum')
   end
@@ -39,4 +43,19 @@ class Forum &lt; Folder
     paragraphs = Hpricot(body).search('p')
     paragraphs.empty? ? '' : paragraphs.first.to_html
   end
+
+  def add_agreed_user(user)
+    self.users_with_agreement << user
+    self.save
+  end
+
+  def agrees_with_terms?(user)
+    return true unless self.has_terms_of_use
+    if user
+      self.users_with_agreement.find_by_id user.id
+    else
+      false
+    end
+  end
+
 end
@@ -63,6 +63,8 @@ class Person &lt; Profile
   has_many :scraps_sent, :class_name => 'Scrap', :foreign_key => :sender_id, :dependent => :destroy
+  has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
+
   named_scope :more_popular,
       :select => "#{Profile.qualified_column_names}, count(friend_id) as total",
       :group => Profile.qualified_column_names,
@@ -11,3 +11,9 @@
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64, :rows => 10)) %>
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Forum.posts_per_page_options)) %>
+
+<%= labelled_form_field(_('Has terms of use:'), check_box(:article, :has_terms_of_use))%>
+
+<div id="text_area_terms_of_use">
+  <%= labelled_form_field(_('Terms of use:'), text_area(:article, :terms_of_use, :class => 'mceEditor',:cols => 64, :rows => 10)) %>
+</div>
@@ -0,0 +1 @@
+<p><%= page.terms_of_use %></p>
 \ No newline at end of file
 <% add_rss_feed_to_head(@page.name, @page.feed.url) if @page.forum? && @page.feed %>
+<% if @page.agrees_with_terms?(user) %>
-<div>
-  <div class='forum-description'>
-    <%= @page.body %>
+  <div>
+    <div class='forum-description'>
+      <%= @page.body %>
+    </div>
   </div>
-</div>
-<hr class="pre-posts"/>
-<div class="forum-posts">
-  <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_forum_posts(@posts)) %>
-</div>
+  <hr class="pre-posts"/>
+  <div class="forum-posts">
+    <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_forum_posts(@posts)) %>
+  </div>
+
+<% else %>
+
+  <p><%= @page.terms_of_use %></p>
+
+  <% form_tag @page.url.merge(:terms_accepted => true) do %>
+    <% button_bar do %>
+      <% if user %>
+        <%= submit_button :save, _("Accept")  %>
+      <% else %>
+        <%= button :save, _("Accept"),  login_url %>
+      <% end %>
+      <%= button "cancel", _("Cancel"), profile.url %>
+    <% end %>
+  <% end %>
+<% end %>
 \ No newline at end of file
@@ -0,0 +1,15 @@
+class TermsForumPeople < ActiveRecord::Migration
+  def self.up
+    create_table :terms_forum_people, :id => false do |t|
+      t.integer :forum_id
+      t.integer :person_id
+    end
+    add_index :terms_forum_people, [:forum_id, :person_id]
+  end
+
+  def self.down
+    remove_index :terms_forum_people, [:forum_id, :person_id]
+    drop_table :terms_forum_people
+  end
+
+end
 \ No newline at end of file
@@ -70,28 +70,99 @@ Feature: forum
     When I follow "Configure forum"
     Then I should be on edit "Forum One" by joaosilva
+  @selenium
+  Scenario: show forum with terms of use for owner
+    Given the following forums
+       | owner     | name      |
+       | joaosilva | Forum One |
+    And I go to /joaosilva/forum-one
+    When I follow "Configure forum"
+    And I fill in "Description" with "My description"
+    And I check "Has terms of use:"
+    And I press "Save"
+    Then I should see "Forum One"
+    And I should see "My description"
+
+  @selenium
+  Scenario: accept terms in topics page
+    Given the following forums
+       | owner     | name      |
+       | joaosilva | Forum One |
+    And the following users
+       | login      | name        |
+       | mariasilva | Maria Silva |
+    And I go to /joaosilva/forum-one
+    When I follow "Configure forum"
+    And I fill in "Description" with "My description"
+    And I check "Has terms of use:"
+    And I press "Save"
+    When I follow "New discussion topic"
+    And I follow "Text article with visual editor"
+    And I fill in "Title" with "Topic"
+    And I press "Save"
+    And I am logged in as "mariasilva"
+    And I go to /joaosilva/forum-one/topic
+    And I press "Accept"
+    Then I should see "Topic"
+
+  @selenium
+  Scenario: accept terms of use of a forum for others users
+    Given the following forums
+       | owner     | name      |
+       | joaosilva | Forum One |
+    And the following users
+       | login      | name        |
+       | mariasilva | Maria Silva |
+    And I go to /joaosilva/forum-one
+    When I follow "Configure forum"
+    And I fill in "Description" with "My description"
+    And I check "Has terms of use:"
+    And I press "Save"
+    When I follow "Logout"
+    And I am logged in as "mariasilva"
+    And I go to /joaosilva/forum-one?terms=terms
+    When I press "Accept"
+    Then I should see "Forum One"
+    And I should see "My description"
+
+  @selenium
+  Scenario: redirect user not logged
+    Given the following forums
+       | owner     | name      |
+       | joaosilva | Forum One |
+    And I go to /joaosilva/forum-one
+    When I follow "Configure forum"
+    And I fill in "Description" with "My description"
+    And I check "Has terms of use:"
+    And I press "Save"
+    When I follow "Logout"
+    And I go to /joaosilva/forum-one?terms=terms
+    When I follow "Accept"
+    Then I should see "Login" within ".login-box"
+
+  @selenium
   Scenario: last topic update by unautenticated user should not link
     Given the following forums
-       | owner     | name |
+       | owner     | name  |
        | joaosilva | Forum |
     And the following articles
-       | owner     | name | parent |
-       | joaosilva | Post one | Forum |
+       | owner     | name     | parent |
+       | joaosilva | Post one | Forum  |
     And the following comments
-       | article | name | email | title | body |
+       | article  | name | email            | title  | body   |
        | Post one | Joao | joao@example.com | Hi all | Hi all |
    When I go to /joaosilva/forum
    Then I should not see "Joao" link
   Scenario: last topic update by autenticated user should link to profile url
     Given the following forums
-       | owner     | name |
+       | owner     | name  |
        | joaosilva | Forum |
     And the following articles
-       | owner     | name | parent |
-       | joaosilva | Post one | Forum |
+       | owner     | name     | parent |
+       | joaosilva | Post one | Forum  |
     And the following comments
-       | article | author | title | body |
+       | article  | author    | title  | body   |
        | Post one | joaosilva | Hi all | Hi all |
    When I go to /joaosilva/forum
    Then I should see "Joao" linking to "http://localhost/joaosilva"
@@ -1084,3 +1084,21 @@ jQuery(function($) {
   });
 });
+
+function showHideTermsOfUse() {
+  if( jQuery("#article_has_terms_of_use").attr("checked") )
+    jQuery("#text_area_terms_of_use").show();
+  else {
+    jQuery("#text_area_terms_of_use").hide();
+    jQuery("#article_terms_of_use").val("");
+    jQuery("#article_terms_of_use_ifr").contents().find("body").html("");
+  }
+}
+
+jQuery(document).ready(function(){
+  showHideTermsOfUse();
+
+  jQuery("#article_has_terms_of_use").click(function(){
+    showHideTermsOfUse();
+  });
+});
 \ No newline at end of file
@@ -1324,10 +1324,11 @@ class CmsControllerTest &lt; ActionController::TestCase
   end
   should 'back to forum after config forum' do
-    profile.articles << Forum.new(:name => 'my-forum', :profile => profile)
-    post :edit, :profile => profile.identifier, :id => profile.forum.id
-
-    assert_redirected_to @profile.articles.find_by_name('my-forum').view_url
+    assert_difference Forum, :count do
+      post :new, :type => Forum.name, :profile => profile.identifier, :article => { :name => 'my-forum' }, :back_to => 'control_panel'
+    end
+      post :edit, :type => Forum.name, :profile => profile.identifier, :article => { :name => 'my forum' }, :id => profile.forum.id
+    assert_redirected_to @profile.articles.find_by_name('my forum').view_url
   end
   should 'back to control panel if cancel create forum' do
	@@ -50,6 +50,17 @@ class ContentViewerController < ApplicationController		@@ -50,6 +50,17 @@ class ContentViewerController < ApplicationController
50		50
51	redirect_to_translation if @page.profile.redirect_l10n	51	redirect_to_translation if @page.profile.redirect_l10n
52		52
		53	+ if request.post?
		54	+ if @page.forum? && @page.has_terms_of_use && params[:terms_accepted] == "true"
		55	+ @page.add_agreed_user(user)
		56	+ end
		57	+ elsif !@page.parent.nil? && @page.parent.forum?
		58	+ unless @page.parent.agrees_with_terms?(user)
		59	+ params[:page].pop
		60	+ redirect_to :profile => params[:profile], :page => params[:page], :action => 'view_page'
		61	+ end
		62	+ end
		63	+
53	# At this point the page will be showed	64	# At this point the page will be showed
54	@page.hit	65	@page.hit
55		66
	@@ -3,6 +3,10 @@ class Forum < Folder		@@ -3,6 +3,10 @@ class Forum < Folder
3	acts_as_having_posts :order => 'updated_at DESC'	3	acts_as_having_posts :order => 'updated_at DESC'
4	include PostsLimit	4	include PostsLimit
5		5
		6	+ settings_items :terms_of_use, :type => :string, :default => ""
		7	+ settings_items :has_terms_of_use, :type => :boolean, :default => false
		8	+ has_and_belongs_to_many :users_with_agreement, :class_name => 'Person', :join_table => 'terms_forum_people'
		9	+
6	def self.type_name	10	def self.type_name
7	_('Forum')	11	_('Forum')
8	end	12	end
	@@ -39,4 +43,19 @@ class Forum < Folder		@@ -39,4 +43,19 @@ class Forum < Folder
39	paragraphs = Hpricot(body).search('p')	43	paragraphs = Hpricot(body).search('p')
40	paragraphs.empty? ? '' : paragraphs.first.to_html	44	paragraphs.empty? ? '' : paragraphs.first.to_html
41	end	45	end
		46	+
		47	+ def add_agreed_user(user)
		48	+ self.users_with_agreement << user
		49	+ self.save
		50	+ end
		51	+
		52	+ def agrees_with_terms?(user)
		53	+ return true unless self.has_terms_of_use
		54	+ if user
		55	+ self.users_with_agreement.find_by_id user.id
		56	+ else
		57	+ false
		58	+ end
		59	+ end
		60	+
42	end	61	end
	@@ -63,6 +63,8 @@ class Person < Profile		@@ -63,6 +63,8 @@ class Person < Profile
63		63
64	has_many :scraps_sent, :class_name => 'Scrap', :foreign_key => :sender_id, :dependent => :destroy	64	has_many :scraps_sent, :class_name => 'Scrap', :foreign_key => :sender_id, :dependent => :destroy
65		65
		66	+ has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
		67	+
66	named_scope :more_popular,	68	named_scope :more_popular,
67	:select => "#{Profile.qualified_column_names}, count(friend_id) as total",	69	:select => "#{Profile.qualified_column_names}, count(friend_id) as total",
68	:group => Profile.qualified_column_names,	70	:group => Profile.qualified_column_names,
	@@ -11,3 +11,9 @@		@@ -11,3 +11,9 @@
11	<%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64, :rows => 10)) %>	11	<%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64, :rows => 10)) %>
12		12
13	<%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Forum.posts_per_page_options)) %>	13	<%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Forum.posts_per_page_options)) %>
		14	+
		15	+<%= labelled_form_field(_('Has terms of use:'), check_box(:article, :has_terms_of_use))%>
		16	+
		17	+<div id="text_area_terms_of_use">
		18	+ <%= labelled_form_field(_('Terms of use:'), text_area(:article, :terms_of_use, :class => 'mceEditor',:cols => 64, :rows => 10)) %>
		19	+</div>
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+<p><%= page.terms_of_use %></p>
0	\ No newline at end of file	2	\ No newline at end of file
1	<% add_rss_feed_to_head(@page.name, @page.feed.url) if @page.forum? && @page.feed %>	1	<% add_rss_feed_to_head(@page.name, @page.feed.url) if @page.forum? && @page.feed %>
		2	+<% if @page.agrees_with_terms?(user) %>
2		3
3	-<div>
4	- <div class='forum-description'>
5	- <%= @page.body %>	4	+ <div>
		5	+ <div class='forum-description'>
		6	+ <%= @page.body %>
		7	+ </div>
6	</div>	8	</div>
7	-</div>
8	-<hr class="pre-posts"/>
9	-<div class="forum-posts">
10	- <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_forum_posts(@posts)) %>
11	-</div>	9	+ <hr class="pre-posts"/>
		10	+ <div class="forum-posts">
		11	+ <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_forum_posts(@posts)) %>
		12	+ </div>
		13	+
		14	+<% else %>
		15	+
		16	+ <p><%= @page.terms_of_use %></p>
		17	+
		18	+ <% form_tag @page.url.merge(:terms_accepted => true) do %>
		19	+ <% button_bar do %>
		20	+ <% if user %>
		21	+ <%= submit_button :save, _("Accept") %>
		22	+ <% else %>
		23	+ <%= button :save, _("Accept"), login_url %>
		24	+ <% end %>
		25	+ <%= button "cancel", _("Cancel"), profile.url %>
		26	+ <% end %>
		27	+ <% end %>
		28	+<% end %>
12	\ No newline at end of file	29	\ No newline at end of file
	@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
		1	+class TermsForumPeople < ActiveRecord::Migration
		2	+ def self.up
		3	+ create_table :terms_forum_people, :id => false do \|t\|
		4	+ t.integer :forum_id
		5	+ t.integer :person_id
		6	+ end
		7	+ add_index :terms_forum_people, [:forum_id, :person_id]
		8	+ end
		9	+
		10	+ def self.down
		11	+ remove_index :terms_forum_people, [:forum_id, :person_id]
		12	+ drop_table :terms_forum_people
		13	+ end
		14	+
		15	+end
0	\ No newline at end of file	16	\ No newline at end of file
	@@ -70,28 +70,99 @@ Feature: forum		@@ -70,28 +70,99 @@ Feature: forum
70	When I follow "Configure forum"	70	When I follow "Configure forum"
71	Then I should be on edit "Forum One" by joaosilva	71	Then I should be on edit "Forum One" by joaosilva
72		72
		73	+ @selenium
		74	+ Scenario: show forum with terms of use for owner
		75	+ Given the following forums
		76	+ \| owner \| name \|
		77	+ \| joaosilva \| Forum One \|
		78	+ And I go to /joaosilva/forum-one
		79	+ When I follow "Configure forum"
		80	+ And I fill in "Description" with "My description"
		81	+ And I check "Has terms of use:"
		82	+ And I press "Save"
		83	+ Then I should see "Forum One"
		84	+ And I should see "My description"
		85	+
		86	+ @selenium
		87	+ Scenario: accept terms in topics page
		88	+ Given the following forums
		89	+ \| owner \| name \|
		90	+ \| joaosilva \| Forum One \|
		91	+ And the following users
		92	+ \| login \| name \|
		93	+ \| mariasilva \| Maria Silva \|
		94	+ And I go to /joaosilva/forum-one
		95	+ When I follow "Configure forum"
		96	+ And I fill in "Description" with "My description"
		97	+ And I check "Has terms of use:"
		98	+ And I press "Save"
		99	+ When I follow "New discussion topic"
		100	+ And I follow "Text article with visual editor"
		101	+ And I fill in "Title" with "Topic"
		102	+ And I press "Save"
		103	+ And I am logged in as "mariasilva"
		104	+ And I go to /joaosilva/forum-one/topic
		105	+ And I press "Accept"
		106	+ Then I should see "Topic"
		107	+
		108	+ @selenium
		109	+ Scenario: accept terms of use of a forum for others users
		110	+ Given the following forums
		111	+ \| owner \| name \|
		112	+ \| joaosilva \| Forum One \|
		113	+ And the following users
		114	+ \| login \| name \|
		115	+ \| mariasilva \| Maria Silva \|
		116	+ And I go to /joaosilva/forum-one
		117	+ When I follow "Configure forum"
		118	+ And I fill in "Description" with "My description"
		119	+ And I check "Has terms of use:"
		120	+ And I press "Save"
		121	+ When I follow "Logout"
		122	+ And I am logged in as "mariasilva"
		123	+ And I go to /joaosilva/forum-one?terms=terms
		124	+ When I press "Accept"
		125	+ Then I should see "Forum One"
		126	+ And I should see "My description"
		127	+
		128	+ @selenium
		129	+ Scenario: redirect user not logged
		130	+ Given the following forums
		131	+ \| owner \| name \|
		132	+ \| joaosilva \| Forum One \|
		133	+ And I go to /joaosilva/forum-one
		134	+ When I follow "Configure forum"
		135	+ And I fill in "Description" with "My description"
		136	+ And I check "Has terms of use:"
		137	+ And I press "Save"
		138	+ When I follow "Logout"
		139	+ And I go to /joaosilva/forum-one?terms=terms
		140	+ When I follow "Accept"
		141	+ Then I should see "Login" within ".login-box"
		142	+
		143	+ @selenium
73	Scenario: last topic update by unautenticated user should not link	144	Scenario: last topic update by unautenticated user should not link
74	Given the following forums	145	Given the following forums
75	- \| owner \| name \|	146	+ \| owner \| name \|
76	\| joaosilva \| Forum \|	147	\| joaosilva \| Forum \|
77	And the following articles	148	And the following articles
78	- \| owner \| name \| parent \|
79	- \| joaosilva \| Post one \| Forum \|	149	+ \| owner \| name \| parent \|
		150	+ \| joaosilva \| Post one \| Forum \|
80	And the following comments	151	And the following comments
81	- \| article \| name \| email \| title \| body \|	152	+ \| article \| name \| email \| title \| body \|
82	\| Post one \| Joao \| joao@example.com \| Hi all \| Hi all \|	153	\| Post one \| Joao \| joao@example.com \| Hi all \| Hi all \|
83	When I go to /joaosilva/forum	154	When I go to /joaosilva/forum
84	Then I should not see "Joao" link	155	Then I should not see "Joao" link
85		156
86	Scenario: last topic update by autenticated user should link to profile url	157	Scenario: last topic update by autenticated user should link to profile url
87	Given the following forums	158	Given the following forums
88	- \| owner \| name \|	159	+ \| owner \| name \|
89	\| joaosilva \| Forum \|	160	\| joaosilva \| Forum \|
90	And the following articles	161	And the following articles
91	- \| owner \| name \| parent \|
92	- \| joaosilva \| Post one \| Forum \|	162	+ \| owner \| name \| parent \|
		163	+ \| joaosilva \| Post one \| Forum \|
93	And the following comments	164	And the following comments
94	- \| article \| author \| title \| body \|	165	+ \| article \| author \| title \| body \|
95	\| Post one \| joaosilva \| Hi all \| Hi all \|	166	\| Post one \| joaosilva \| Hi all \| Hi all \|
96	When I go to /joaosilva/forum	167	When I go to /joaosilva/forum
97	Then I should see "Joao" linking to "http://localhost/joaosilva"	168	Then I should see "Joao" linking to "http://localhost/joaosilva"
	@@ -1084,3 +1084,21 @@ jQuery(function($) {		@@ -1084,3 +1084,21 @@ jQuery(function($) {
1084	});	1084	});
1085		1085
1086	});	1086	});
		1087	+
		1088	+function showHideTermsOfUse() {
		1089	+ if( jQuery("#article_has_terms_of_use").attr("checked") )
		1090	+ jQuery("#text_area_terms_of_use").show();
		1091	+ else {
		1092	+ jQuery("#text_area_terms_of_use").hide();
		1093	+ jQuery("#article_terms_of_use").val("");
		1094	+ jQuery("#article_terms_of_use_ifr").contents().find("body").html("");
		1095	+ }
		1096	+}
		1097	+
		1098	+jQuery(document).ready(function(){
		1099	+ showHideTermsOfUse();
		1100	+
		1101	+ jQuery("#article_has_terms_of_use").click(function(){
		1102	+ showHideTermsOfUse();
		1103	+ });
		1104	+});
1087	\ No newline at end of file	1105	\ No newline at end of file