merge with master

Leandro Santos
2 parents 3c582887 f9687c15
Showing 7 changed files with 55 additions and 28 deletions Show diff stats
app/models/article.rb
app/models/comment.rb
app/views/content_viewer/view_page.html.erb
plugins/vote/lib/ext/vote.rb
public/javascripts/article.js
test/unit/article_test.rb
test/unit/comment_test.rb
@@ -8,9 +8,8 @@ class Article &lt; ActiveRecord::Base
                   :accept_comments, :feed, :published, :source, :source_name,
                   :highlighted, :notify_comments, :display_hits, :slug,
                   :external_feed_builder, :display_versions, :external_link,
-                  :image_builder, :show_to_followers,
-                  :author, :display_preview, :published_at, :person_followers,
-                  :archived
+                  :image_builder, :show_to_followers, :archived,
+                  :author, :display_preview, :published_at, :person_followers
   acts_as_having_image
   include Noosfero::Plugin::HotSpot
@@ -221,13 +221,13 @@ class Comment &lt; ActiveRecord::Base
   end
   def archived?
-    self.article.archived? if self.article.present? && self.article.respond_to?(:archived?)
+    self.source && self.source.is_a?(Article) && self.source.archived?
   end
   protected
   def article_archived?
-    errors.add(:article, N_('associated with this comment is achived!')) if archived?
+    errors.add(:article, N_('associated with this comment is archived!')) if archived?
   end
 end
@@ -85,7 +85,7 @@
       <% end %>
     </ul>
-    <% if !@page.archived? || @page.accept_comments? %>
+    <% if !@page.archived? && @page.accept_comments? %>
       <div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>
     <% end %>
   </div><!-- end class="comments" -->
@@ -0,0 +1,18 @@
+require_dependency 'models/vote'
+
+class Vote
+
+  validate :verify_target_archived
+
+  def verify_target_archived
+
+    if voteable.kind_of?(Article) || voteable.kind_of?(Comment)
+      if voteable.archived?
+        errors.add(:base, _("The target is achived and can't accept votes"))
+        false
+      end
+    end
+    
+  end
+
+end
@@ -206,4 +206,15 @@ jQuery(function($) {
     return false;
   });
+  //Hide / Show the text area
+  $("#article_published_false").click(show_hide_privacy_options);
+  $("#article_published_true").click(show_hide_privacy_options);
+  $(".custom_privacy_option").click(show_hide_token_input);
+
+  //Workaround to pointer-events:none CSS3  
+  $('a.disabled').click(function(e){
+    e.preventDefault();
+    return false;
+  });
+
 });
@@ -2232,27 +2232,6 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert !a.display_preview?
   end
-  should 'check if a article is archived' do
-    folder = Folder.create!(:name => 'Parent Archived', :profile => profile)
-    a1 = Article.create!(:name => 'Test', :profile => profile, :parent_id => folder.id, :archived => false)
-    a2 = Article.create!(:name => 'Test 2', :profile => profile, :archived => true)
-    folder.update_attributes(:archived => true)
-    a1.reload
-
-    assert a1.archived?
-    assert a2.archived?
-  end
-
-  should 'try add a child article to a archived folder' do
-    folder = Folder.create!(:name => 'Parent Archived', :profile => profile, :archived => true)
-
-    err = assert_raises ActiveRecord::RecordInvalid do
-      a1 = Article.create!(:name => 'Test', :profile => profile, :parent_id => folder.id, :archived => false)
-    end
-
-    assert_match 'Parent folder is archived', err.message
-  end
-
   should 'return full_path' do
     p1 = fast_create(Profile)
     p2 = fast_create(Profile)
@@ -2320,5 +2299,25 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal 10, article.reload.person_followers.count
   end
+  should 'check if a article is archived' do
+    folder = Folder.create!(:name => 'Parent Archived', :profile => profile)
+    a1 = Article.create!(:name => 'Test', :profile => profile, :parent_id => folder.id, :archived => false)
+    a2 = Article.create!(:name => 'Test 2', :profile => profile, :archived => true)
+    folder.update_attributes(:archived => true)
+    a1.reload
+
+    assert a1.archived?
+    assert a2.archived?
+  end
+
+  should 'try add a child article to a archived folder' do
+    folder = Folder.create!(:name => 'Parent Archived', :profile => profile, :archived => true)
+
+    err = assert_raises ActiveRecord::RecordInvalid do
+      a1 = Article.create!(:name => 'Test', :profile => profile, :parent_id => folder.id, :archived => false)
+    end
+
+    assert_match 'Parent folder is archived', err.message
+  end
 end
@@ -103,7 +103,7 @@ class CommentTest &lt; ActiveSupport::TestCase
       comment = create(Comment, :source => article, :author_id => person.id)
     end
-    assert_match 'Article associated with this comment is achived', err.message
+    assert_match 'Article associated with this comment is archived', err.message
   end
   should 'provide author name for authenticated authors' do
	@@ -221,13 +221,13 @@ class Comment < ActiveRecord::Base		@@ -221,13 +221,13 @@ class Comment < ActiveRecord::Base
221	end	221	end
222		222
223	def archived?	223	def archived?
224	- self.article.archived? if self.article.present? && self.article.respond_to?(:archived?)	224	+ self.source && self.source.is_a?(Article) && self.source.archived?
225	end	225	end
226		226
227	protected	227	protected
228		228
229	def article_archived?	229	def article_archived?
230	- errors.add(:article, N_('associated with this comment is achived!')) if archived?	230	+ errors.add(:article, N_('associated with this comment is archived!')) if archived?
231	end	231	end
232		232
233	end	233	end
	@@ -85,7 +85,7 @@		@@ -85,7 +85,7 @@
85	<% end %>	85	<% end %>
86	</ul>	86	</ul>
87		87
88	- <% if !@page.archived? \|\| @page.accept_comments? %>	88	+ <% if !@page.archived? && @page.accept_comments? %>
89	<div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>	89	<div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>
90	<% end %>	90	<% end %>
91	</div><!-- end class="comments" -->	91	</div><!-- end class="comments" -->
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+require_dependency 'models/vote'
	2	+
	3	+class Vote
	4	+
	5	+ validate :verify_target_archived
	6	+
	7	+ def verify_target_archived
	8	+
	9	+ if voteable.kind_of?(Article) \|\| voteable.kind_of?(Comment)
	10	+ if voteable.archived?
	11	+ errors.add(:base, _("The target is achived and can't accept votes"))
	12	+ false
	13	+ end
	14	+ end
	15	+
	16	+ end
	17	+
	18	+end
	@@ -206,4 +206,15 @@ jQuery(function($) {		@@ -206,4 +206,15 @@ jQuery(function($) {
206	return false;	206	return false;
207	});	207	});
208		208
		209	+ //Hide / Show the text area
		210	+ $("#article_published_false").click(show_hide_privacy_options);
		211	+ $("#article_published_true").click(show_hide_privacy_options);
		212	+ $(".custom_privacy_option").click(show_hide_token_input);
		213	+
		214	+ //Workaround to pointer-events:none CSS3
		215	+ $('a.disabled').click(function(e){
		216	+ e.preventDefault();
		217	+ return false;
		218	+ });
		219	+
209	});	220	});
	@@ -103,7 +103,7 @@ class CommentTest < ActiveSupport::TestCase		@@ -103,7 +103,7 @@ class CommentTest < ActiveSupport::TestCase
103	comment = create(Comment, :source => article, :author_id => person.id)	103	comment = create(Comment, :source => article, :author_id => person.id)
104	end	104	end
105		105
106	- assert_match 'Article associated with this comment is achived', err.message	106	+ assert_match 'Article associated with this comment is archived', err.message
107	end	107	end
108		108
109	should 'provide author name for authenticated authors' do	109	should 'provide author name for authenticated authors' do