proposals_discussion: allow discussion without topics

Victor Costa
1 parent 41ccccb1
Showing 23 changed files with 213 additions and 124 deletions Show diff stats
lib/proposals_discussion_plugin.rb
lib/proposals_discussion_plugin/discussion.rb
lib/proposals_discussion_plugin/proposal.rb
lib/proposals_discussion_plugin/proposals_holder.rb
lib/proposals_discussion_plugin/topic.rb
lib/proposals_discussion_plugin/topic_helper.rb
public/proposals_list.js
public/style.css
test/functional/content_viewer_controller_test.rb
test/functional/proposals_discussion_plugin_profile_controller_test.rb
test/functional/proposals_discussion_plugin_public_controller_test.rb
test/unit/discussion_test.rb
test/unit/proposal_test.rb
test/unit/proposals_discussion_plugin_test.rb
test/unit/topic_test.rb
views/cms/proposals_discussion_plugin/_discussion.html.erb
views/cms/proposals_discussion_plugin/_proposal.html.erb
views/content_viewer/_proposal_card.html.erb
views/content_viewer/_statistics.html.erb
views/content_viewer/discussion.html.erb
@@ -19,7 +19,7 @@ class ProposalsDiscussionPlugin &lt; Noosfero::Plugin
       parent = parent_id ? context.profile.articles.find(parent_id) : nil
       types << ProposalsDiscussionPlugin::Discussion
       types << ProposalsDiscussionPlugin::Topic if parent.kind_of?(ProposalsDiscussionPlugin::Discussion)
-      types << ProposalsDiscussionPlugin::Proposal if parent.kind_of?(ProposalsDiscussionPlugin::Topic)
+      types << ProposalsDiscussionPlugin::Proposal if parent.kind_of?(ProposalsDiscussionPlugin::Topic) || ( parent.kind_of?(ProposalsDiscussionPlugin::Discussion) && !parent.allow_topics)
       types
     else
       [ProposalsDiscussionPlugin::Discussion,
-class ProposalsDiscussionPlugin::Discussion < Folder
+class ProposalsDiscussionPlugin::Discussion < ProposalsDiscussionPlugin::ProposalsHolder
   acts_as_having_posts
   has_many :topics, :class_name => 'ProposalsDiscussionPlugin::Topic', :foreign_key => 'parent_id'
-  has_many :proposals, :class_name => 'ProposalsDiscussionPlugin::Proposal', :through => :children, :source => :children
-  has_many :proposals_comments, :class_name => 'Comment', :through => :proposals, :source => :comments
+  has_many :topics_proposals, :class_name => 'ProposalsDiscussionPlugin::Proposal', :through => :children, :source => :children
+  has_many :topics_proposals_comments, :class_name => 'Comment', :through => :topics_proposals, :source => :comments
+  has_many :discussion_proposals, :class_name => 'ProposalsDiscussionPlugin::Proposal', :foreign_key => 'parent_id'
+  has_many :discussion_proposals_comments, :class_name => 'Comment', :through => :discussion_proposals, :source => :comments
+  has_many :proposals_authors, :class_name => 'Person', :through => :children, :source => :created_by
+
+  def proposals
+    allow_topics ? topics_proposals : discussion_proposals
+  end
+
+  def proposals_comments
+    allow_topics ? topics_proposals_comments : discussion_proposals_comments
+  end
   settings_items :custom_body_label, :type => :string, :default => _('Body')
+  settings_items :allow_topics, :type => :boolean, :default => false
-  attr_accessible :custom_body_label
+  attr_accessible :custom_body_label, :allow_topics
   def self.short_description
     _("Discussion")
@@ -21,22 +33,17 @@ class ProposalsDiscussionPlugin::Discussion &lt; Folder
   def to_html(options = {})
     discussion = self
     proc do
-      render :file => 'content_viewer/discussion', :locals => {:discussion => discussion}
+      if discussion.allow_topics
+        render :file => 'content_viewer/discussion_topics', :locals => {:discussion => discussion}
+      else
+        render :file => 'content_viewer/discussion', :locals => {:discussion => discussion}
+      end
     end
   end
-  def cache_key_with_person(params = {}, user = nil, language = 'en')
-    cache_key_without_person + (user ? "-#{user.identifier}" : '')
-  end
-  alias_method_chain :cache_key, :person
-
   def posts
     #override posts method to list proposals in feed
     ProposalsDiscussionPlugin::Proposal.from_discussion(self)
   end
-  def accept_comments?
-    accept_comments
-  end
-
 end
@@ -3,7 +3,7 @@ class ProposalsDiscussionPlugin::Proposal &lt; TinyMceArticle
   scope :private, lambda {|user| {:conditions => {:last_changed_by_id => user.id, :published => false}}}
   scope :from_discussion, lambda {|discussion| joins(:parent).where(['parents_articles.parent_id = ?', discussion.id])}
-  alias :topic :parent
+  belongs_to :topic, :foreign_key => :parent_id, :class_name => 'ProposalsDiscussionPlugin::Topic'
   def self.short_description
     _("Proposal")
@@ -15,6 +15,9 @@ class ProposalsDiscussionPlugin::Proposal &lt; TinyMceArticle
   validates_presence_of :abstract
+  def discussion
+    parent.kind_of?(ProposalsDiscussionPlugin::Discussion) ? parent : parent.discussion
+  end
   def to_html(options = {})
     proposal = self
@@ -35,8 +38,8 @@ class ProposalsDiscussionPlugin::Proposal &lt; TinyMceArticle
     comments_count
   end
-  def normalized_score(holder)
-    (score/holder.max_score.to_f).round(2)
+  def normalized_score
+    (score/parent.max_score.to_f).round(2)
   end
   def cache_key_with_person(params = {}, user = nil, language = 'en')
@@ -0,0 +1,45 @@
+class ProposalsDiscussionPlugin::ProposalsHolder < Folder
+
+  def accept_comments?
+    accept_comments
+  end
+
+  def max_score
+    @max ||= [1, proposals.maximum(:comments_count)].max
+  end
+
+  def proposals_per_day
+    result = proposals.group("date(created_at)").count
+    fill_empty_days(result)
+  end
+
+  def comments_per_day
+    result = proposals.joins(:comments).group('date(comments.created_at)').count('comments.id')
+    fill_empty_days(result)
+  end
+
+  def most_active_participants
+    proposals_authors.group('profiles.id').order('count(articles.id) DESC').includes(:environment, :preferred_domain, :image)
+  end
+
+  def fill_empty_days(result)
+    from = created_at.to_date
+    (from..Date.today).inject({}) do |h, date|
+      h[date.to_s] = result[date.to_s] || 0
+      h
+    end
+  end
+
+  def proposal_tags
+    proposals.tag_counts.inject({}) do |memo,tag|
+      memo[tag.name] = tag.count
+      memo
+    end
+  end
+
+  def cache_key_with_person(params = {}, user = nil, language = 'en')
+    cache_key_without_person + (user ? "-#{user.identifier}" : '')
+  end
+  alias_method_chain :cache_key, :person
+
+end
-class ProposalsDiscussionPlugin::Topic < Folder
+class ProposalsDiscussionPlugin::Topic  < ProposalsDiscussionPlugin::ProposalsHolder
   alias :discussion :parent
@@ -18,10 +18,6 @@ class ProposalsDiscussionPlugin::Topic &lt; Folder
     _('Container for proposals.')
   end
-  def most_active_participants
-    proposals_authors.group('profiles.id').order('count(articles.id) DESC').includes(:environment, :preferred_domain, :image)
-  end
-
   def to_html(options = {})
     topic = self
     proc do
@@ -33,42 +29,4 @@ class ProposalsDiscussionPlugin::Topic &lt; Folder
     true
   end
-  def max_score
-    @max ||= [1, proposals.maximum(:comments_count)].max
-  end
-
-  def proposal_tags
-    proposals.tag_counts.inject({}) do |memo,tag|
-      memo[tag.name] = tag.count
-      memo
-    end
-  end
-
-  def proposals_per_day
-    result = proposals.group("date(created_at)").count
-    fill_empty_days(result)
-  end
-
-  def comments_per_day
-    result = proposals.joins(:comments).group('date(comments.created_at)').count('comments.id')
-    fill_empty_days(result)
-  end
-
-  def fill_empty_days(result)
-    from = created_at.to_date
-    (from..Date.today).inject({}) do |h, date|
-      h[date.to_s] = result[date.to_s] || 0
-      h
-    end
-  end
-
-  def cache_key_with_person(params = {}, user = nil, language = 'en')
-    cache_key_without_person + (user ? "-#{user.identifier}" : '')
-  end
-  alias_method_chain :cache_key, :person
-
-  def accept_comments?
-    accept_comments
-  end
-
 end
 module ProposalsDiscussionPlugin::TopicHelper
   def topic_title(topic)
+    return if topic.blank?
     image_icon = topic.image ?  image_tag(topic.image.public_filename(:thumb), :class => 'disable-zoom') : ''
     content_tag(:div, (
@@ -10,7 +10,7 @@ jQuery(document).ready(function($) {
   });
   function proposalsScroll() {
-    var scroll = $('.article-body-proposals-discussion-plugin_topic .topic-content .proposals_list .proposals');
+    var scroll = $('.article-body-proposals-discussion-plugin_topic .topic-content .proposals_list .proposals, .article-body-proposals-discussion-plugin_discussion .proposals_list .proposals');
     var nextSelector = 'div.more a';
     if(scroll.data('jscroll')) scroll.data('jscroll', null);
@@ -149,13 +149,13 @@ form .proposals-discussion-plugin .body textarea {
 #content #article .topic-item h2, #content #article .article-body-proposals-discussion-plugin_topic h2,
 #content #article .topic h2,
-#content .topic .topic-title h2 {
+#content .topic-title h2 {
   background-color: #BDBDBD;
   margin: 0;
 }
 #content .topic-item h2 a, #article .article-body-proposals-discussion-plugin_topic h2 a,
-#content .topic h2 a {
+#content .topic-title h2 a {
   text-decoration: none;
   display: inline-block;
   color: white;
@@ -213,7 +213,8 @@ form .proposals-discussion-plugin .body textarea {
 .article-body-proposals-discussion-plugin_topic .graph {
   float: left;
 }
-.article-body-proposals-discussion-plugin_topic .graph #proposals-time {
+.article-body-proposals-discussion-plugin_topic .graph #proposals-time,
+.article-body-proposals-discussion-plugin_discussion .graph #proposals-time {
   height: 150px;
   width: 300px;
 }
@@ -18,4 +18,18 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'div', :attributes => {:class => 'content'}, :content => 'Proposal Body'
   end
+  should 'display discussion with topics' do
+    discussion.allow_topics = true
+    discussion.save!
+    get :view_page, discussion.url
+    assert_template 'content_viewer/discussion_topics'
+  end
+
+  should 'display discussion without topics' do
+    discussion.allow_topics = false
+    discussion.save!
+    get :view_page, discussion.url
+    assert_template 'content_viewer/discussion'
+  end
+
 end
@@ -4,7 +4,7 @@ class ProposalsDiscussionPluginProfileControllerTest &lt; ActionController::TestCas
   def setup
     @profile = fast_create(Community)
-    @discussion = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id)
+    @discussion = ProposalsDiscussionPlugin::Discussion.create!(:profile => @profile, :name => 'discussion',:allow_topics => true)
     @topic = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => @discussion.id, :profile_id => @profile.id)
     @person = create_user_with_permission('testinguser', 'post_content')
     login_as :testinguser
@@ -4,7 +4,7 @@ class ProposalsDiscussionPluginPublicControllerTest &lt; ActionController::TestCase
   def setup
     @profile = fast_create(Community)
-    @discussion = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id)
+    @discussion = ProposalsDiscussionPlugin::Discussion.create!(:profile => @profile, :allow_topics => true, :name => 'discussion')
     @topic = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => @discussion.id, :profile_id => @profile.id)
   end
@@ -21,7 +21,17 @@ class DiscussionTest &lt; ActiveSupport::TestCase
     topic = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => discussion.id)
     proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)
     proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)
-    assert_equivalent [proposal1, proposal2], discussion.proposals
+    assert_equivalent [proposal1, proposal2], discussion.topics_proposals
+  end
+
+  should 'return max score' do
+    person = fast_create(Person)
+    discussion = ProposalsDiscussionPlugin::Discussion.create!(:profile => person, :name => 'discussion')
+    proposal1 = ProposalsDiscussionPlugin::Proposal.create!(:parent => discussion, :profile => profile, :name => "proposal1", :abstract => 'abstract')
+    proposal2 = ProposalsDiscussionPlugin::Proposal.create!(:parent => discussion, :profile => profile, :name => "proposal2", :abstract => 'abstract')
+    10.times { Comment.create!(:source => proposal1, :body => "comment", :author => person) }
+    5.times { Comment.create!(:source => proposal2, :body => "comment", :author => person) }
+    assert_equal 10, discussion.max_score
   end
 end
@@ -51,4 +51,14 @@ class ProposalTest &lt; ActiveSupport::TestCase
     assert_equivalent [proposal1, proposal3], ProposalsDiscussionPlugin::Proposal.from_discussion(discussion)
   end
+  should 'return normalized score' do
+    discussion = ProposalsDiscussionPlugin::Discussion.create!(:profile => person, :name => 'discussion')
+    proposal1 = ProposalsDiscussionPlugin::Proposal.create!(:parent => discussion, :profile => profile, :name => "proposal1", :abstract => 'abstract')
+    proposal2 = ProposalsDiscussionPlugin::Proposal.create!(:parent => discussion, :profile => profile, :name => "proposal2", :abstract => 'abstract')
+    10.times { Comment.create!(:source => proposal1, :body => "comment", :author => person) }
+    5.times { Comment.create!(:source => proposal2, :body => "comment", :author => person) }
+    assert_equal 1, proposal1.reload.normalized_score
+    assert_equal 0.5, proposal2.reload.normalized_score
+  end
+
 end
@@ -32,6 +32,12 @@ class ProposalsDiscussionPluginTest &lt; ActiveSupport::TestCase
     assert_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal
   end
+  should 'return Proposal as a content type if parent is a Discussion and allow_topic is false' do
+    parent = ProposalsDiscussionPlugin::Discussion.create!(:profile => @profile, :name => 'discussion', :allow_topics => false)
+    @params[:parent_id] = parent.id
+    assert_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal
+  end
+
   should 'do not return Proposal as a content type if parent is nil' do
     @params[:parent_id] = nil
     assert_not_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal
@@ -47,4 +47,13 @@ class TopicTest &lt; ActiveSupport::TestCase
     assert_equal [author2, author1], topic.most_active_participants
   end
+  should 'return max score' do
+    person = fast_create(Person)
+    proposal1 = ProposalsDiscussionPlugin::Proposal.create!(:parent => topic, :profile => profile, :name => "proposal1", :abstract => 'abstract')
+    proposal2 = ProposalsDiscussionPlugin::Proposal.create!(:parent => topic, :profile => profile, :name => "proposal2", :abstract => 'abstract')
+    10.times { Comment.create!(:source => proposal1, :body => "comment", :author => person) }
+    5.times { Comment.create!(:source => proposal2, :body => "comment", :author => person) }
+    assert_equal 10, topic.max_score
+  end
+
 end
-sdadasda
 <%= required_fields_message %>
 <%= required f.text_field('name', :size => '64', :maxlength => 150) %>
@@ -7,3 +6,4 @@ sdadasda
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
 <%= f.text_field(:custom_body_label) %>
+<%= labelled_form_field check_box(:article, :allow_topics) + _('Allow topics'), '' %>
@@ -9,9 +9,7 @@
 <div class="proposals-discussion-plugin">
-  <div class="topic">
-    <%= topic_title @article.topic %>
-  </div>
+  <%= topic_title @article.topic %>
   <div class="title">
     <%= required labelled_form_field _('Title'), limited_text_area(:article, :name, title_limit, 'title_textarea', :rows => 1) %>
@@ -23,7 +21,7 @@
   <div class="body">
     <% editor_type = 'mceEditor' %>
-    <%= labelled_form_field(strip_tags(@article.topic.discussion.custom_body_label), text_area(:article, :body, :class => editor_type)) %>
+    <%= labelled_form_field(strip_tags(@article.discussion.custom_body_label), text_area(:article, :body, :class => editor_type)) %>
   </div>
 </div>
 <div class="proposal">
   <div class="score">
     <% if proposal_card.published? %>
-      <% normalized_score = proposal_card.normalized_score(@holder) %>
+      <% normalized_score = proposal_card.normalized_score %>
       <% pos = 26 * (normalized_score*4 - 1).round %>
       <span title="<%= normalized_score %>" style="background-position-y: -<%= pos %>px">&nbsp;</span>
     <% end %>
@@ -0,0 +1,32 @@
+<div class="statistics">
+  <h5><%= _('Statistics') %></h5>
+
+  <div class="graph">
+    <div id="proposals-time"></div>
+  </div>
+  <%= javascript_include_tag 'plugins/proposals_discussion/proposals_graph.js' %>
+  <script>load_proposals_graph('<%= holder.proposals_per_day.to_json %>', '<%= holder.comments_per_day.to_json %>', '<%= _('Proposals') %>', '<%= _('Comments') %>')</script>
+
+  <div class="summary">
+    <div class="proposals-count">
+      <span class="label"><%= _('Number of Proposals: ') %></span>
+      <span class="content"><%= holder.proposals.count %></span>
+    </div>
+    <div class="participants-count">
+      <span class="label"><%= _('Number of Participants: ') %></span>
+      <span class="content"><%= holder.proposals_authors.count %></span>
+    </div>
+    <div class="comments-count">
+      <span class="label"><%= _('Number of Comments: ') %></span>
+      <span class="content"><%= holder.proposals_comments.count %></span>
+    </div>
+    <div class="active-participants">
+      <span class="label"><%= _('Most active: ') %></span>
+      <span class="content">
+        <% holder.most_active_participants.each do |author| %>
+          <%= link_to profile_image(author, :icon), author.url, :title => author.name %>
+        <% end %>
+      </span>
+    </div>
+  </div>
+</div>
@@ -8,26 +8,20 @@
 <% if discussion.allow_create?(user) %>
 <div class="actions">
-  <%= link_to({:controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Topic", :parent_id => discussion.id}, :class => 'button with-text icon-add') do %>
-    <strong><%= _("New Topic") %></strong>
-  <% end %>
   <%= link_to({:controller => :proposals_discussion_plugin_profile, :action => :export, :format => :csv, :article_id => discussion.id}, :class => 'button with-text icon-spread') do %>
     <strong><%= _('Export') %></strong>
   <% end %>
 </div>
 <% end %>
-<div class="topics js-masonry" data-masonry-options='{ "itemSelector": ".topic-item", "columnWidth": 200 }'>
-  <div class="actions topic-item">
-    <div class="topic-color"></div>
-    <%= link_to url_for({:controller => 'proposals_discussion_plugin_myprofile', :action => 'select_topic', :parent_id => discussion.id}), :class => 'button with-text icon-add' do %>
-      <strong><%= _("Send your proposal!") %></strong>
-    <% end %>
-  </div>
-  <% discussion.topics.includes(:profile).each do |topic| %>
-    <div class="topic-item" id="topic-<%= topic.id %>">
-      <%= render :file => 'content_viewer/topic', :locals => {:topic => topic, :list_view => true} %>
-    </div>
-  <% end %>
+<%= link_to url_for({:controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Proposal", :parent_id => discussion.id}), :class => 'button with-text icon-add' do %>
+  <strong><%= _("Send your proposal!") %></strong>
+<% end %>
+
+<%= render :partial => 'content_viewer/statistics', :locals => {:holder => discussion} %>
+
+<div class="tag_cloud">
+  <%= tag_cloud(discussion.proposal_tags, :tag, {:action => :tag, :controller => 'search'}, :max_size => 18, :min_size => 10) %>
 </div>
+<%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => discussion} %>
@@ -0,0 +1,33 @@
+<%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %>
+
+<%= add_rss_feed_to_head(discussion.name, discussion.feed.url) if discussion.feed %>
+
+<div class="description">
+  <%= discussion.body %>
+</div>
+
+<% if discussion.allow_create?(user) %>
+<div class="actions">
+  <%= link_to({:controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Topic", :parent_id => discussion.id}, :class => 'button with-text icon-add') do %>
+    <strong><%= _("New Topic") %></strong>
+  <% end %>
+  <%= link_to({:controller => :proposals_discussion_plugin_profile, :action => :export, :format => :csv, :article_id => discussion.id}, :class => 'button with-text icon-spread') do %>
+    <strong><%= _('Export') %></strong>
+  <% end %>
+</div>
+<% end %>
+
+<div class="topics js-masonry" data-masonry-options='{ "itemSelector": ".topic-item", "columnWidth": 200 }'>
+  <div class="actions topic-item">
+    <div class="topic-color"></div>
+    <%= link_to url_for({:controller => 'proposals_discussion_plugin_myprofile', :action => 'select_topic', :parent_id => discussion.id}), :class => 'button with-text icon-add' do %>
+      <strong><%= _("Send your proposal!") %></strong>
+    <% end %>
+  </div>
+  <% discussion.topics.includes(:profile).each do |topic| %>
+    <div class="topic-item" id="topic-<%= topic.id %>">
+      <%= render :file => 'content_viewer/topic', :locals => {:topic => topic, :list_view => true} %>
+    </div>
+  <% end %>
+</div>
+
@@ -5,14 +5,12 @@
 </span>
 <div class="discussion">
-  <h5><%= proposal.topic.discussion.title %> </h5>
+  <h5><%= proposal.discussion.title %> </h5>
 </div>
 <% extend ProposalsDiscussionPlugin::TopicHelper %>
-<div class="topic">
-  <%= topic_title proposal.topic %>
-</div>
+<%= topic_title proposal.topic %>
 <div class="abstract">
   <div class="content"><%= proposal.abstract %></div>
@@ -16,38 +16,8 @@
 <% unless list_view %>
   <h4><%= topic.discussion.title %></h4>
-  <div class="statistics">
-    <h5><%= _('Statistics') %></h5>
+  <%= render :partial => 'content_viewer/statistics', :locals => {:holder => topic} %>
-    <div class="graph">
-      <div id="proposals-time"></div>
-    </div>
-    <%= javascript_include_tag 'plugins/proposals_discussion/proposals_graph.js' %>
-    <script>load_proposals_graph('<%= topic.proposals_per_day.to_json %>', '<%= topic.comments_per_day.to_json %>', '<%= _('Proposals') %>', '<%= _('Comments') %>')</script>
-
-    <div class="summary">
-      <div class="proposals-count">
-        <span class="label"><%= _('Number of Proposals: ') %></span>
-        <span class="content"><%= topic.proposals.count %></span>
-      </div>
-      <div class="participants-count">
-        <span class="label"><%= _('Number of Participants: ') %></span>
-        <span class="content"><%= topic.proposals_authors.count %></span>
-      </div>
-      <div class="comments-count">
-        <span class="label"><%= _('Number of Comments: ') %></span>
-        <span class="content"><%= topic.proposals_comments.count %></span>
-      </div>
-      <div class="active-participants">
-        <span class="label"><%= _('Most active: ') %></span>
-        <span class="content">
-          <% topic.most_active_participants.each do |author| %>
-            <%= link_to profile_image(author, :icon), author.url, :title => author.name %>
-          <% end %>
-        </span>
-      </div>
-    </div>
-  </div>
   <div class="tag_cloud">
     <%= tag_cloud(topic.proposal_tags, :tag, {:action => :tag, :controller => 'search'}, :max_size => 18, :min_size => 10) %>
   </div>
	@@ -19,7 +19,7 @@ class ProposalsDiscussionPlugin < Noosfero::Plugin		@@ -19,7 +19,7 @@ class ProposalsDiscussionPlugin < Noosfero::Plugin
19	parent = parent_id ? context.profile.articles.find(parent_id) : nil	19	parent = parent_id ? context.profile.articles.find(parent_id) : nil
20	types << ProposalsDiscussionPlugin::Discussion	20	types << ProposalsDiscussionPlugin::Discussion
21	types << ProposalsDiscussionPlugin::Topic if parent.kind_of?(ProposalsDiscussionPlugin::Discussion)	21	types << ProposalsDiscussionPlugin::Topic if parent.kind_of?(ProposalsDiscussionPlugin::Discussion)
22	- types << ProposalsDiscussionPlugin::Proposal if parent.kind_of?(ProposalsDiscussionPlugin::Topic)	22	+ types << ProposalsDiscussionPlugin::Proposal if parent.kind_of?(ProposalsDiscussionPlugin::Topic) \|\| ( parent.kind_of?(ProposalsDiscussionPlugin::Discussion) && !parent.allow_topics)
23	types	23	types
24	else	24	else
25	[ProposalsDiscussionPlugin::Discussion,	25	[ProposalsDiscussionPlugin::Discussion,
@@ -0,0 +1,45 @@		@@ -0,0 +1,45 @@
	1	+class ProposalsDiscussionPlugin::ProposalsHolder < Folder
	2	+
	3	+ def accept_comments?
	4	+ accept_comments
	5	+ end
	6	+
	7	+ def max_score
	8	+ @max \|\|= [1, proposals.maximum(:comments_count)].max
	9	+ end
	10	+
	11	+ def proposals_per_day
	12	+ result = proposals.group("date(created_at)").count
	13	+ fill_empty_days(result)
	14	+ end
	15	+
	16	+ def comments_per_day
	17	+ result = proposals.joins(:comments).group('date(comments.created_at)').count('comments.id')
	18	+ fill_empty_days(result)
	19	+ end
	20	+
	21	+ def most_active_participants
	22	+ proposals_authors.group('profiles.id').order('count(articles.id) DESC').includes(:environment, :preferred_domain, :image)
	23	+ end
	24	+
	25	+ def fill_empty_days(result)
	26	+ from = created_at.to_date
	27	+ (from..Date.today).inject({}) do \|h, date\|
	28	+ h[date.to_s] = result[date.to_s] \|\| 0
	29	+ h
	30	+ end
	31	+ end
	32	+
	33	+ def proposal_tags
	34	+ proposals.tag_counts.inject({}) do \|memo,tag\|
	35	+ memo[tag.name] = tag.count
	36	+ memo
	37	+ end
	38	+ end
	39	+
	40	+ def cache_key_with_person(params = {}, user = nil, language = 'en')
	41	+ cache_key_without_person + (user ? "-#{user.identifier}" : '')
	42	+ end
	43	+ alias_method_chain :cache_key, :person
	44	+
	45	+end
1	-class ProposalsDiscussionPlugin::Topic < Folder	1	+class ProposalsDiscussionPlugin::Topic < ProposalsDiscussionPlugin::ProposalsHolder
2		2
3	alias :discussion :parent	3	alias :discussion :parent
4		4
	@@ -18,10 +18,6 @@ class ProposalsDiscussionPlugin::Topic < Folder		@@ -18,10 +18,6 @@ class ProposalsDiscussionPlugin::Topic < Folder
18	_('Container for proposals.')	18	_('Container for proposals.')
19	end	19	end
20		20
21	- def most_active_participants
22	- proposals_authors.group('profiles.id').order('count(articles.id) DESC').includes(:environment, :preferred_domain, :image)
23	- end
24	-
25	def to_html(options = {})	21	def to_html(options = {})
26	topic = self	22	topic = self
27	proc do	23	proc do
	@@ -33,42 +29,4 @@ class ProposalsDiscussionPlugin::Topic < Folder		@@ -33,42 +29,4 @@ class ProposalsDiscussionPlugin::Topic < Folder
33	true	29	true
34	end	30	end
35		31
36	- def max_score
37	- @max \|\|= [1, proposals.maximum(:comments_count)].max
38	- end
39	-
40	- def proposal_tags
41	- proposals.tag_counts.inject({}) do \|memo,tag\|
42	- memo[tag.name] = tag.count
43	- memo
44	- end
45	- end
46	-
47	- def proposals_per_day
48	- result = proposals.group("date(created_at)").count
49	- fill_empty_days(result)
50	- end
51	-
52	- def comments_per_day
53	- result = proposals.joins(:comments).group('date(comments.created_at)').count('comments.id')
54	- fill_empty_days(result)
55	- end
56	-
57	- def fill_empty_days(result)
58	- from = created_at.to_date
59	- (from..Date.today).inject({}) do \|h, date\|
60	- h[date.to_s] = result[date.to_s] \|\| 0
61	- h
62	- end
63	- end
64	-
65	- def cache_key_with_person(params = {}, user = nil, language = 'en')
66	- cache_key_without_person + (user ? "-#{user.identifier}" : '')
67	- end
68	- alias_method_chain :cache_key, :person
69	-
70	- def accept_comments?
71	- accept_comments
72	- end
73	-
74	end	32	end
1	module ProposalsDiscussionPlugin::TopicHelper	1	module ProposalsDiscussionPlugin::TopicHelper
2		2
3	def topic_title(topic)	3	def topic_title(topic)
		4	+ return if topic.blank?
4	image_icon = topic.image ? image_tag(topic.image.public_filename(:thumb), :class => 'disable-zoom') : ''	5	image_icon = topic.image ? image_tag(topic.image.public_filename(:thumb), :class => 'disable-zoom') : ''
5		6
6	content_tag(:div, (	7	content_tag(:div, (
	@@ -10,7 +10,7 @@ jQuery(document).ready(function($) {		@@ -10,7 +10,7 @@ jQuery(document).ready(function($) {
10	});	10	});
11		11
12	function proposalsScroll() {	12	function proposalsScroll() {
13	- var scroll = $('.article-body-proposals-discussion-plugin_topic .topic-content .proposals_list .proposals');	13	+ var scroll = $('.article-body-proposals-discussion-plugin_topic .topic-content .proposals_list .proposals, .article-body-proposals-discussion-plugin_discussion .proposals_list .proposals');
14	var nextSelector = 'div.more a';	14	var nextSelector = 'div.more a';
15	if(scroll.data('jscroll')) scroll.data('jscroll', null);	15	if(scroll.data('jscroll')) scroll.data('jscroll', null);
16		16
	@@ -18,4 +18,18 @@ class ContentViewerControllerTest < ActionController::TestCase		@@ -18,4 +18,18 @@ class ContentViewerControllerTest < ActionController::TestCase
18	assert_tag :tag => 'div', :attributes => {:class => 'content'}, :content => 'Proposal Body'	18	assert_tag :tag => 'div', :attributes => {:class => 'content'}, :content => 'Proposal Body'
19	end	19	end
20		20
		21	+ should 'display discussion with topics' do
		22	+ discussion.allow_topics = true
		23	+ discussion.save!
		24	+ get :view_page, discussion.url
		25	+ assert_template 'content_viewer/discussion_topics'
		26	+ end
		27	+
		28	+ should 'display discussion without topics' do
		29	+ discussion.allow_topics = false
		30	+ discussion.save!
		31	+ get :view_page, discussion.url
		32	+ assert_template 'content_viewer/discussion'
		33	+ end
		34	+
21	end	35	end
	@@ -4,7 +4,7 @@ class ProposalsDiscussionPluginProfileControllerTest < ActionController::TestCas		@@ -4,7 +4,7 @@ class ProposalsDiscussionPluginProfileControllerTest < ActionController::TestCas
4		4
5	def setup	5	def setup
6	@profile = fast_create(Community)	6	@profile = fast_create(Community)
7	- @discussion = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id)	7	+ @discussion = ProposalsDiscussionPlugin::Discussion.create!(:profile => @profile, :name => 'discussion',:allow_topics => true)
8	@topic = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => @discussion.id, :profile_id => @profile.id)	8	@topic = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => @discussion.id, :profile_id => @profile.id)
9	@person = create_user_with_permission('testinguser', 'post_content')	9	@person = create_user_with_permission('testinguser', 'post_content')
10	login_as :testinguser	10	login_as :testinguser
	@@ -21,7 +21,17 @@ class DiscussionTest < ActiveSupport::TestCase		@@ -21,7 +21,17 @@ class DiscussionTest < ActiveSupport::TestCase
21	topic = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => discussion.id)	21	topic = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => discussion.id)
22	proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)	22	proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)
23	proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)	23	proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)
24	- assert_equivalent [proposal1, proposal2], discussion.proposals	24	+ assert_equivalent [proposal1, proposal2], discussion.topics_proposals
		25	+ end
		26	+
		27	+ should 'return max score' do
		28	+ person = fast_create(Person)
		29	+ discussion = ProposalsDiscussionPlugin::Discussion.create!(:profile => person, :name => 'discussion')
		30	+ proposal1 = ProposalsDiscussionPlugin::Proposal.create!(:parent => discussion, :profile => profile, :name => "proposal1", :abstract => 'abstract')
		31	+ proposal2 = ProposalsDiscussionPlugin::Proposal.create!(:parent => discussion, :profile => profile, :name => "proposal2", :abstract => 'abstract')
		32	+ 10.times { Comment.create!(:source => proposal1, :body => "comment", :author => person) }
		33	+ 5.times { Comment.create!(:source => proposal2, :body => "comment", :author => person) }
		34	+ assert_equal 10, discussion.max_score
25	end	35	end
26		36
27	end	37	end
	@@ -51,4 +51,14 @@ class ProposalTest < ActiveSupport::TestCase		@@ -51,4 +51,14 @@ class ProposalTest < ActiveSupport::TestCase
51	assert_equivalent [proposal1, proposal3], ProposalsDiscussionPlugin::Proposal.from_discussion(discussion)	51	assert_equivalent [proposal1, proposal3], ProposalsDiscussionPlugin::Proposal.from_discussion(discussion)
52	end	52	end
53		53
		54	+ should 'return normalized score' do
		55	+ discussion = ProposalsDiscussionPlugin::Discussion.create!(:profile => person, :name => 'discussion')
		56	+ proposal1 = ProposalsDiscussionPlugin::Proposal.create!(:parent => discussion, :profile => profile, :name => "proposal1", :abstract => 'abstract')
		57	+ proposal2 = ProposalsDiscussionPlugin::Proposal.create!(:parent => discussion, :profile => profile, :name => "proposal2", :abstract => 'abstract')
		58	+ 10.times { Comment.create!(:source => proposal1, :body => "comment", :author => person) }
		59	+ 5.times { Comment.create!(:source => proposal2, :body => "comment", :author => person) }
		60	+ assert_equal 1, proposal1.reload.normalized_score
		61	+ assert_equal 0.5, proposal2.reload.normalized_score
		62	+ end
		63	+
54	end	64	end
	@@ -32,6 +32,12 @@ class ProposalsDiscussionPluginTest < ActiveSupport::TestCase		@@ -32,6 +32,12 @@ class ProposalsDiscussionPluginTest < ActiveSupport::TestCase
32	assert_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal	32	assert_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal
33	end	33	end
34		34
		35	+ should 'return Proposal as a content type if parent is a Discussion and allow_topic is false' do
		36	+ parent = ProposalsDiscussionPlugin::Discussion.create!(:profile => @profile, :name => 'discussion', :allow_topics => false)
		37	+ @params[:parent_id] = parent.id
		38	+ assert_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal
		39	+ end
		40	+
35	should 'do not return Proposal as a content type if parent is nil' do	41	should 'do not return Proposal as a content type if parent is nil' do
36	@params[:parent_id] = nil	42	@params[:parent_id] = nil
37	assert_not_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal	43	assert_not_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal