Merge branch 'AI3220_proposals' into rails3_stable

Victor Costa
2 parents 3f675a65 711903e3
Showing 35 changed files with 905 additions and 6 deletions Show diff stats
app/controllers/admin/features_controller.rb
app/helpers/categories_helper.rb
app/models/article.rb
features/step_definitions/web_steps.rb
plugins/proposals_discussion/controllers/myprofile/proposals_discussion_plugin_myprofile_controller.rb
plugins/proposals_discussion/controllers/public/proposals_discussion_plugin_public_controller.rb
plugins/proposals_discussion/lib/proposals_discussion_plugin.rb
plugins/proposals_discussion/lib/proposals_discussion_plugin/discussion.rb
plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal.rb
plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal_helper.rb
plugins/proposals_discussion/lib/proposals_discussion_plugin/proposals_list_helper.rb
plugins/proposals_discussion/lib/proposals_discussion_plugin/topic.rb
plugins/proposals_discussion/public/images/comments.gif
plugins/proposals_discussion/public/jquery.jscroll.min.js
plugins/proposals_discussion/public/proposals_list.js
plugins/proposals_discussion/public/style.css
plugins/proposals_discussion/test/functional/proposals_discussion_plugin_myprofile_controller_test.rb
plugins/proposals_discussion/test/functional/proposals_discussion_plugin_public_controller_test.rb
plugins/proposals_discussion/test/test_helper.rb
plugins/proposals_discussion/test/unit/discussion_test.rb
@@ -93,7 +93,7 @@ class FeaturesController &lt; AdminController
   def search_members
     arg = params[:q].downcase
-    result = environment.people.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    result = environment.people.find(:all, :conditions => ['LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%"])
     render :text => prepare_to_token_input(result).to_json
   end
@@ -12,7 +12,7 @@ module CategoriesHelper
   end
   def category_color_style(category)
-    return '' if category.display_color.blank?
+    return '' if category.nil? or category.display_color.blank?
     'background-color: #'+category.display_color+';'
   end
@@ -252,7 +252,7 @@ class Article &lt; ActiveRecord::Base
   }
   scope :public,
-    :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], :joins => [:profile]
+    :conditions => [ "articles.advertise = ? AND articles.published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], :joins => [:profile]
   scope :more_recent,
     :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
@@ -11,8 +11,14 @@ require File.expand_path(File.join(File.dirname(__FILE__), &quot;..&quot;, &quot;support&quot;, &quot;pat
 module WithinHelpers
   def with_scope(locator)
-    locator = locator ? first(locator) : locator
-    locator ? within(locator) { yield } : yield
+    if locator
+      locator = first(locator) || locator
+      within(locator) do
+        yield
+      end
+    else
+      yield
+    end
   end
 end
 World(WithinHelpers)
@@ -0,0 +1,30 @@
+class ProposalsDiscussionPluginMyprofileController < MyProfileController
+
+  before_filter :check_edit_permission_to_proposal, :only => :publish_proposal
+
+  def select_topic
+    @discussion = profile.articles.find(params[:parent_id])
+    render :file => 'select_topic'
+  end
+
+  def new_proposal
+    redirect_to :controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Proposal", :parent_id => params[:discussion][:topic]
+  end
+
+  def publish_proposal
+    if @proposal.update_attribute(:published, true)
+      session[:notice] = _('Proposal published!')
+    else
+      session[:notice] = _('Failed to publish your proposal.')
+    end
+    redirect_to @proposal.topic.view_url
+  end
+
+  protected
+
+  def check_edit_permission_to_proposal
+    @proposal = profile.articles.find(params[:proposal_id])
+    render_access_denied unless @proposal.allow_edit?(user)
+  end
+
+end
@@ -0,0 +1,43 @@
+class ProposalsDiscussionPluginPublicController < ApplicationController
+
+  needs_profile
+
+  def load_proposals
+    holder = profile.articles.find(params[:holder_id])
+    page = (params[:page] || 1).to_i
+    set_rand_cookie if page == 1
+    order = params[:order]
+
+    @proposals = order_proposals(holder.proposals.public, order)
+    @proposals = @proposals.page(page).per_page(5)
+
+    unless @proposals.empty?
+      render :partial => 'content_viewer/proposals_list_content', :locals => {:proposals => @proposals, :holder => holder, :page => page+1, :order => order}
+    else
+      render :text => ''
+    end
+  end
+
+  private
+
+  def order_proposals(proposals, order)
+    case order
+    when 'alphabetical'
+      proposals.reorder('name')
+    else
+      set_seed
+      proposals.reorder('random()')
+    end
+  end
+
+  def set_seed
+    #XXX postgresql specific
+    seed_val = profile.connection.quote(cookies[:_noosfero_proposals_discussion_rand_seed])
+    profile.connection.execute("select setseed(#{seed_val})")
+  end
+
+  def set_rand_cookie
+    cookies[:_noosfero_proposals_discussion_rand_seed] = {value: rand, expires: Time.now + 600}
+  end
+
+end
@@ -0,0 +1,43 @@
+class ProposalsDiscussionPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    'Discussion of Proposals'
+  end
+
+  def self.plugin_description
+    _("Provide a structured way to promove a discussion over ideas proposed by users.")
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def content_types
+    if context.respond_to?(:params) && context.params
+      types = []
+      parent_id = context.params[:parent_id]
+      parent = parent_id ? context.profile.articles.find(parent_id) : nil
+      types << ProposalsDiscussionPlugin::Discussion unless parent
+      types << ProposalsDiscussionPlugin::Topic if parent.kind_of?(ProposalsDiscussionPlugin::Discussion)
+      types << ProposalsDiscussionPlugin::Proposal if parent.kind_of?(ProposalsDiscussionPlugin::Topic)
+      types
+    else
+      [ProposalsDiscussionPlugin::Discussion,
+        ProposalsDiscussionPlugin::Topic,
+        ProposalsDiscussionPlugin::Proposal]
+    end
+  end
+
+  def content_remove_new(page)
+    page.kind_of?(ProposalsDiscussionPlugin::Discussion) ||
+      page.kind_of?(ProposalsDiscussionPlugin::Topic) ||
+      page.kind_of?(ProposalsDiscussionPlugin::Proposal)
+  end
+
+  def content_remove_upload(page)
+    page.kind_of?(ProposalsDiscussionPlugin::Discussion) ||
+      page.kind_of?(ProposalsDiscussionPlugin::Topic) ||
+      page.kind_of?(ProposalsDiscussionPlugin::Proposal)
+  end
+
+end
@@ -0,0 +1,20 @@
+class ProposalsDiscussionPlugin::Discussion < Folder
+
+  has_many :topics, :class_name => 'ProposalsDiscussionPlugin::Topic', :foreign_key => 'parent_id'
+  has_many :proposals, :class_name => 'ProposalsDiscussionPlugin::Proposal', :through => :children, :source => :children
+
+  def self.short_description
+    _("Discussion")
+  end
+
+  def self.description
+    _('Container for topics.')
+  end
+
+  def to_html(options = {})
+    proc do
+      render :file => 'content_viewer/discussion'
+    end
+  end
+
+end
@@ -0,0 +1,28 @@
+class ProposalsDiscussionPlugin::Proposal < TinyMceArticle
+
+  scope :private, lambda {|user| {:conditions => {:last_changed_by_id => user.id, :published => false}}}
+
+  alias :topic :parent
+
+  def self.short_description
+    _("Proposal")
+  end
+
+  def self.description
+    _('Proposal')
+  end
+
+  validates_presence_of :abstract
+
+
+  def to_html(options = {})
+    proc do
+      render :file => 'content_viewer/proposal'
+    end
+  end
+
+  def allow_edit?(user)
+    super || created_by == user
+  end
+
+end
@@ -0,0 +1,8 @@
+module ProposalsDiscussionPlugin::ProposalHelper
+
+  def visibility_options(article, tokenized_children)
+    article.published = false if article.new_record?
+    super
+  end
+
+end
@@ -0,0 +1,7 @@
+module ProposalsDiscussionPlugin::ProposalsListHelper
+
+  def more_proposals(text, holder, order, page=1)
+    link_to '', url_for({:controller => 'proposals_discussion_plugin_public', :action => 'load_proposals', :holder_id => holder.id, :profile => profile.identifier, :order => order, :page => page })
+  end
+
+end
@@ -0,0 +1,35 @@
+class ProposalsDiscussionPlugin::Topic < Folder
+
+  alias :discussion :parent
+
+  has_many :proposals, :class_name => 'ProposalsDiscussionPlugin::Proposal', :foreign_key => 'parent_id'
+  has_many :proposals_comments, :class_name => 'Comment', :through => :children, :source => :comments
+  has_many :proposals_authors, :class_name => 'Person', :through => :children, :source => :created_by
+
+  settings_items :color, :type => :string
+
+  attr_accessible :color
+
+  def self.short_description
+    _("Discussion topic")
+  end
+
+  def self.description
+    _('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 = {})
+    proc do
+      render :file => 'content_viewer/topic'
+    end
+  end
+
+  def allow_create?(user)
+    true
+  end
+
+end
@@ -0,0 +1,15 @@
+/*!
+ * jScroll - jQuery Plugin for Infinite Scrolling / Auto-Paging - v2.2.4
+ * http://jscroll.com/
+ *
+ * Copyright 2011-2013, Philip Klauzinski
+ * http://klauzinski.com/
+ * Dual licensed under the MIT and GPL Version 2 licenses.
+ * http://jscroll.com/#license
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * @author Philip Klauzinski
+ * @requires jQuery v1.4.3+
+ */
+(function(b){b.jscroll={defaults:{debug:false,autoTrigger:true,autoTriggerUntil:false,loadingHtml:"<small>Loading...</small>",padding:0,nextSelector:"a:last",contentSelector:"",pagingSelector:"",callback:false}};var a=function(e,g){var o=e.data("jscroll"),n=(typeof g==="function")?{callback:g}:g,p=b.extend({},b.jscroll.defaults,n,o||{}),c=(e.css("overflow-y")==="visible"),l=e.find(p.nextSelector).first(),v=b(window),h=b("body"),q=c?v:e,m=b.trim(l.attr("href")+" "+p.contentSelector);e.data("jscroll",b.extend({},o,{initialized:true,waiting:false,nextHref:m}));r();k();t();function k(){var x=b(p.loadingHtml).filter("img").attr("src");if(x){var w=new Image();w.src=x}}function r(){if(!e.find(".jscroll-inner").length){e.contents().wrapAll('<div class="jscroll-inner" />')}}function d(w){if(p.pagingSelector){var x=w.closest(p.pagingSelector).hide()}else{var x=w.parent().not(".jscroll-inner,.jscroll-added").addClass("jscroll-next-parent").hide();if(!x.length){w.wrap('<div class="jscroll-next-parent" />').parent().hide()}}}function j(){return q.unbind(".jscroll").removeData("jscroll").find(".jscroll-inner").children().unwrap().filter(".jscroll-added").children().unwrap()}function i(){r();var D=e.find("div.jscroll-inner").first(),B=e.data("jscroll"),C=parseInt(e.css("borderTopWidth")),y=isNaN(C)?0:C,x=parseInt(e.css("paddingTop"))+y,A=c?q.scrollTop():e.offset().top,z=D.length?D.offset().top:0,w=Math.ceil(A-z+q.height()+x);if(!B.waiting&&w+p.padding>=D.outerHeight()){f("info","jScroll:",D.outerHeight()-w,"from bottom. Loading next request...");return u()}}function s(w){w=w||e.data("jscroll");if(!w||!w.nextHref){f("warn","jScroll: nextSelector not found - destroying");j();return false}else{t();return true}}function t(){var w=e.find(p.nextSelector).first();if(p.autoTrigger&&(p.autoTriggerUntil===false||p.autoTriggerUntil>0)){d(w);if(h.height()<=v.height()){i()}q.unbind(".jscroll").bind("scroll.jscroll",function(){return i()});if(p.autoTriggerUntil>0){p.autoTriggerUntil--}}else{q.unbind(".jscroll");w.bind("click.jscroll",function(){d(w);u();return false})}}function u(){var x=e.find("div.jscroll-inner").first(),w=e.data("jscroll");w.waiting=true;x.append('<div class="jscroll-added" />').children(".jscroll-added").last().html('<div class="jscroll-loading">'+p.loadingHtml+"</div>");return e.animate({scrollTop:x.outerHeight()},0,function(){x.find("div.jscroll-added").last().load(w.nextHref,function(A,z,B){if(z==="error"){return j()}var y=b(this).find(p.nextSelector).first();w.waiting=false;w.nextHref=y.attr("href")?b.trim(y.attr("href")+" "+p.contentSelector):false;b(".jscroll-next-parent",e).remove();s();if(p.callback){p.callback.call(this)}f("dir",w)})})}function f(w){if(p.debug&&typeof console==="object"&&(typeof w==="object"||typeof console[w]==="function")){if(typeof w==="object"){var y=[];for(var x in w){if(typeof console[x]==="function"){y=(w[x].length)?w[x]:[w[x]];console[x].apply(console,y)}else{console.log.apply(console,y)}}}else{console[w].apply(console,Array.prototype.slice.call(arguments,1))}}}b.extend(e.jscroll,{destroy:j});return e};b.fn.jscroll=function(c){return this.each(function(){var f=b(this),e=f.data("jscroll");if(e&&e.initialized){return}var d=new a(f,c)})}})(jQuery);
 \ No newline at end of file
@@ -0,0 +1,31 @@
+function initTwitterButton() {
+  !function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');
+}
+
+jQuery(document).ready(function($) {
+  initTwitterButton();
+  $('.proposals').on('mouseenter', '.proposal', function() {
+      twttr.widgets.load();
+      $('.proposal .social').hide();
+      $(this).find('.social').show("fast");
+    }).on('mouseleave', '.proposal', function() {
+      $(this).find('.social').hide("fast");
+  });
+
+  function proposalsScroll() {
+    $('.proposals').data('jscroll', null);
+    $('.proposals').jscroll({
+      loadingHtml: '<img src="/images/loading.gif" alt="Loading" />Loading...',
+      nextSelector: 'div.more a'
+    });
+    $('.proposals').trigger('scroll.jscroll');
+  }
+  proposalsScroll();
+
+  $('.proposals_list .filters a.order').on('ajax:success', function(event, data, status, xhr) {
+    $('.proposals_list .filters a.order').removeClass('selected');
+    $(this).addClass('selected');
+    $(this).parents('div.proposals_list').find('.proposals').html(data);
+    proposalsScroll();
+  });
+});
@@ -0,0 +1,124 @@
+.private-proposals .proposal {
+  background: url(/images/hachure.png);
+  opacity: 0.5;
+  filter: alpha(opacity=25);
+  zoom: 1;
+}
+
+.proposal {
+  background: rgb(236, 236, 236);
+  width: 100%;
+  min-width: 272px;
+  vertical-align: top;
+  margin: 12px 13px 12px 0;
+  box-shadow: 5px 5px 5px -2px #ddd;
+  height: 100px;
+}
+
+.article-body-proposals-discussion-plugin_discussion .actions,
+.article-body-proposals-discussion-plugin_topic .actions {
+  margin: 10px 0 25px 0;
+}
+
+.proposal .content, .proposal .score, .proposal .topic {
+  display: table-cell;
+  border-right: 1px solid;
+  border-color: rgb(201, 201, 201);
+  padding: 5px;
+  vertical-align: middle;
+  height: 100%;
+}
+.proposal .topic {
+  border-right: 0;
+  text-align: center;
+  width: 24%;
+}
+.proposal .score {
+  width: 8%;
+  text-align: center;
+}
+
+.proposal .content:hover, .proposal .topic:hover {
+  background: rgba(0, 0, 0, 0.1);
+}
+
+.proposal .title {
+  font-weight: bold;
+  font-size: 15px;
+}
+
+#article .proposal a:visited, #article .proposal a {
+  color: rgb(70, 70, 70);
+  text-decoration: none;
+  width: 100%;
+  display: inline-block;
+}
+
+#article .proposal .title a {
+  padding: 4px 0px;
+}
+
+.proposal .content {
+  width: 68%;
+  color: rgb(83, 83, 83);
+  vertical-align: top;
+  height: 90px;
+}
+
+.proposal .abstract {
+  padding-top: 4px;
+}
+
+form .proposals-discussion-plugin textarea {
+  width: 98%;
+}
+
+form .proposals-discussion-plugin .abstract textarea {
+  height: 60px;
+}
+
+form .proposals-discussion-plugin .body textarea {
+  height: 400px;
+}
+
+.topic-color {
+  width: 9px;
+  float: left;
+  height: 100%;
+}
+
+.topics .topic {
+  background-color: rgb(233, 233, 233);
+  margin: 5px 0;
+  height: 25px;
+}
+
+#article .proposal .topic a {
+  font-weight: bold;
+  color: #888a85;
+  width: 100%;
+  height: 100%;
+}
+
+#article .topics .topic a {
+  text-decoration: none;
+  display: inline-block;
+  width: 95%;
+  height: 100%;
+  padding-left: 5px;
+  font-weight: bold;
+  font-size: 14px;
+}
+
+.proposals_list .filters {
+  float: right;
+}
+#article .proposals_list .filters a {
+  text-decoration: none;
+  border-left: 1px solid rgb(185, 185, 185);
+  padding: 0 5px;
+  color: #555753;
+}
+.proposals_list .filters a.selected {
+  font-weight: bold;
+}
@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ProposalsDiscussionPluginMyprofileControllerTest < ActionController::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @discussion = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id)
+    @topic = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => @discussion.id, :profile_id => @profile.id)
+    @person = create_user_with_permission('testinguser', 'post_content')
+    login_as :testinguser
+  end
+
+  attr_reader :profile, :discussion, :topic, :person
+
+  should 'list topics for selection' do
+    3.times {fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => discussion.id, :profile_id => profile.id)}
+    get :select_topic, :profile => profile.identifier, :parent_id => discussion.id
+    assert_equal discussion, assigns(:discussion)
+    assert_select 'div#topics' do
+      assert_select 'div.content', discussion.topics.count
+      assert_select "input[name='discussion[topic]']", discussion.topics.count
+    end
+    assert_tag :form, :attributes => {:action => "/myprofile/#{profile.identifier}/plugin/proposals_discussion/myprofile/new_proposal"}
+  end
+
+  should 'new_proposal redirect to cms controller' do
+    get :new_proposal, :profile => profile.identifier, :discussion => {:topic => topic.id}
+    assert_redirected_to :controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Proposal", :parent_id => topic.id
+  end
+
+  should 'publish a proposal' do
+    proposal = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id, :profile_id => profile.id, :published => false, :created_by_id => person.id)
+    get :publish_proposal, :proposal_id => proposal.id, :profile => profile.identifier
+    assert proposal.reload.published
+  end
+
+  should 'do not publish if the logged user do not have edition permission' do
+    proposal = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id, :profile_id => profile.id, :published => false)
+    get :publish_proposal, :proposal_id => proposal.id, :profile => profile.identifier
+    assert_response 403
+    assert !proposal.reload.published
+  end
+
+end
@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ProposalsDiscussionPluginPublicControllerTest < ActionController::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @discussion = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id)
+    @topic = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => @discussion.id, :profile_id => @profile.id)
+  end
+
+  attr_reader :profile, :discussion, :topic
+
+  should 'load proposals' do
+    proposals = 3.times.map { fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal title', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)}
+    get :load_proposals, :profile => profile.identifier, :holder_id => discussion.id
+    assert_equivalent proposals, assigns(:proposals)
+  end
+
+  should 'add link to next page' do
+    proposal = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal title', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    get :load_proposals, :profile => profile.identifier, :holder_id => discussion.id
+    assert_match /href=.*page=2/, response.body
+  end
+
+  should 'render blank text if it is the last page' do
+    get :load_proposals, :profile => profile.identifier, :holder_id => discussion.id
+    assert_equal '', response.body
+  end
+
+  should 'load proposals with alphabetical order' do
+    proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'z proposal', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'abc proposal', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'abd proposal', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    get :load_proposals, :profile => profile.identifier, :holder_id => discussion.id, :order => 'alphabetical'
+    assert_equal [proposal2, proposal3, proposal1], assigns(:proposals)
+  end
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class DiscussionTest < ActiveSupport::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @discussion = ProposalsDiscussionPlugin::Discussion.new(:name => 'test', :profile => @profile)
+  end
+
+  attr_reader :profile, :discussion
+
+  should 'return list of topics' do
+    discussion.save!
+    topic1 = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => discussion.id)
+    topic2 = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => discussion.id)
+    assert_equivalent [topic1, topic2], discussion.topics
+  end
+
+  should 'return list of proposals' do
+    discussion.save!
+    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
+  end
+
+end
@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ProposalTest < ActiveSupport::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @person = fast_create(Person)
+    @proposal = ProposalsDiscussionPlugin::Proposal.new(:name => 'test', :profile => @profile)
+    @proposal.created_by = @person
+  end
+
+  attr_reader :profile, :proposal, :person
+
+  should 'save a proposal' do
+    proposal.abstract = 'abstract'
+    assert proposal.save
+  end
+
+  should 'do not save a proposal without abstract' do
+    proposal.save
+    assert proposal.errors['abstract'].present?
+  end
+
+  should 'allow edition if user is the author' do
+    assert proposal.allow_edit?(person)
+  end
+
+  should 'do not allow edition if user is not the author' do
+    assert !proposal.allow_edit?(fast_create(Person))
+  end
+
+end
@@ -0,0 +1,76 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ProposalsDiscussionPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = ProposalsDiscussionPlugin.new
+    @profile = fast_create(Community)
+    @params = {}
+    @plugin.stubs(:context).returns(self)
+  end
+
+  attr_reader :plugin, :profile, :params
+
+  should 'has stylesheet' do
+    assert @plugin.stylesheet?
+  end
+
+  should 'return Discussion as a content type' do
+    @params[:parent_id] = nil
+    assert_includes plugin.content_types, ProposalsDiscussionPlugin::Discussion
+  end
+
+  should 'do not return Discussion as a content type if it has a parent' do
+    parent = fast_create(Folder, :profile_id => @profile.id)
+    @params[:parent_id] = parent.id
+    assert_not_includes plugin.content_types, ProposalsDiscussionPlugin::Discussion
+  end
+
+  should 'return Topic as a content type if parent is a Discussion' do
+    parent = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id)
+    @params[:parent_id] = parent.id
+    assert_includes plugin.content_types, ProposalsDiscussionPlugin::Topic
+  end
+
+  should 'return Proposal as a content type if parent is a Topic' do
+    parent = fast_create(ProposalsDiscussionPlugin::Topic, :profile_id => @profile.id)
+    @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
+  end
+
+  should 'remove new button from content page for a discussion' do
+    page = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id)
+    assert plugin.content_remove_new(page)
+  end
+
+  should 'remove upload button from content page for a discussion' do
+    page = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id)
+    assert plugin.content_remove_upload(page)
+  end
+
+  should 'remove new button from content page for a proposal' do
+    page = fast_create(ProposalsDiscussionPlugin::Proposal, :profile_id => @profile.id)
+    assert plugin.content_remove_new(page)
+  end
+
+  should 'remove upload button from content page for a proposal' do
+    page = fast_create(ProposalsDiscussionPlugin::Proposal, :profile_id => @profile.id)
+    assert plugin.content_remove_upload(page)
+  end
+
+  should 'do not remove new button from content page for others article types' do
+    page = fast_create(Article, :profile_id => @profile.id)
+    assert !plugin.content_remove_new(page)
+  end
+
+  should 'do not remove upload button from content page for others article types' do
+    page = fast_create(Article, :profile_id => @profile.id)
+    assert !plugin.content_remove_upload(page)
+  end
+
+end
@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TopicTest < ActiveSupport::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @topic = ProposalsDiscussionPlugin::Topic.new(:name => 'test', :profile => @profile)
+  end
+
+  attr_reader :profile, :topic
+
+  should 'return list of proposals' do
+    topic.save!
+    proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)
+    proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)
+    assert_equivalent [proposal1, proposal2], topic.proposals
+  end
+
+  should 'allow any user to create proposals in a topic' do
+    assert topic.allow_create?(Person.new)
+  end
+
+  should 'return list of comments' do
+    topic.save!
+    proposal = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)
+    comment1 = fast_create(Comment, :source_id => proposal.id)
+    comment2 = fast_create(Comment, :source_id => proposal.id)
+    assert_equivalent [comment1, comment2], topic.proposals_comments
+  end
+
+  should 'return list of authors' do
+    topic.save!
+    author1 = fast_create(Person)
+    author2 = fast_create(Person)
+    fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id, :created_by_id => author1)
+    fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id, :created_by_id => author2)
+    assert_equivalent [author1, author2], topic.proposals_authors
+  end
+
+  should 'return most active participants' do
+    topic.save!
+    author1 = fast_create(Person)
+    author2 = fast_create(Person)
+    fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id, :created_by_id => author1)
+    fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id, :created_by_id => author2)
+    fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id, :created_by_id => author2)
+    assert_equal [author2, author1], topic.most_active_participants
+  end
+
+end
@@ -0,0 +1,28 @@
+<%= required_fields_message %>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<% title_limit = 70 %>
+<% abstract_limit = 140 %>
+
+<div class="proposals-discussion-plugin">
+  <div class="title">
+    <%= required labelled_form_field _('Title'), limited_text_area(:article, :name, title_limit, 'title_textarea', :rows => 1) %>
+  </div>
+
+  <div class="abstract">
+    <%= required labelled_form_field _('Abstract'), limited_text_area(:article, :abstract, abstract_limit, 'abstract_textarea') %>
+  </div>
+
+  <div class="body">
+    <% editor_type = 'mceEditor' %>
+    <%= labelled_form_field(_('Text'), text_area(:article, :body, :class => editor_type)) %>
+  </div>
+</div>
+
+<script>
+jQuery( document ).ready(function( $ ) {
+  limited_text_area('title_textarea', <%= title_limit %>);
+  limited_text_area('abstract_textarea', <%= abstract_limit %>);
+});
+</script>
@@ -0,0 +1,13 @@
+<%= stylesheet_link_tag 'spectrum.css' %>
+<%= javascript_include_tag "spectrum.js" %>
+<%= javascript_include_tag "colorpicker-noosfero.js" %>
+
+<%= required_fields_message %>
+
+<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
+<%= render :partial => 'general_fields' %>
+
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
+
+<%= labelled_colorpicker_field(_('Color:'), :article, :color) %>
+<span id="color_preview" class = "color_marker" style="background-color: <%= @article.color %>" ></span>
@@ -0,0 +1,20 @@
+<div class="proposal">
+  <div class="topic-color" style="background-color: <%= proposal_card.topic.color %>;"></div>
+  <div class="content">
+    <div class="title">
+      <%= link_to proposal_card.name, proposal_card.view_url %>
+    </div>
+    <div class="social">
+      <%= render :partial => 'content_viewer/social', :locals => {:proposal => proposal_card} %>
+    </div>
+    <div class="abstract">
+      <%= link_to strip_tags(proposal_card.abstract), proposal_card.view_url %>
+    </div>
+  </div>
+  <div class="score">
+    <%= proposal_card.comments_count %>
+  </div>
+  <div class="topic">
+    <%= link_to proposal_card.topic.title, proposal_card.topic.view_url %>
+  </div>
+</div>
@@ -0,0 +1,30 @@
+<script src="/javascripts/plugins/proposals_discussion/jquery.jscroll.min.js" type="text/javascript"></script>
+<%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %>
+
+<% extend ProposalsDiscussionPlugin::ProposalsListHelper %>
+
+<% private_proposals = user ? @page.proposals.private(user) : [] %>
+<% unless private_proposals.empty? %>
+<div class="private-proposals">
+  <h5><%= _('My private proposals') %></h5>
+  <%= render :partial => 'content_viewer/proposal_card', :collection => private_proposals %>
+</div>
+<% end %>
+
+<% order ||= 'random' %>
+<div class="proposals_list">
+  <h5><%= _('Proposals') %></h5>
+  <div class="filters">
+    <% [[_('Random'), :random], [_('Aplhabetical'), :alphabetical]].each_with_index do |order, i| %>
+      <%= link_to order.first, url_for({:controller => 'proposals_discussion_plugin_public', :action => 'load_proposals', :holder_id => holder.id, :profile => profile.identifier, :order => order.second}), :remote => true, :class => "order #{order.second} #{i==0 ? 'selected':''}" %>
+    <% end %>
+  </div>
+  <div class="clear"></div>
+
+  <div class="proposals">
+    <div class="more">
+      <img src="/images/loading.gif" alt="Loading" /><%= _("Loading...") %>
+      <%= more_proposals('', holder, order) %>
+    </div>
+  </div>
+</div>
@@ -0,0 +1,7 @@
+<%= render :partial => 'content_viewer/proposal_card', :collection => proposals %>
+
+<% extend ProposalsDiscussionPlugin::ProposalsListHelper %>
+
+<div class="more">
+  <%= more_proposals(_('More'), holder, order, page) %>
+</div>
@@ -0,0 +1,3 @@
+<% if proposal.published? %>
+  <a href="https://twitter.com/share" class="twitter-share-button" data-url="<%= url_for proposal.view_url %>" data-text="<%= proposal.title %>" data-count="none"></a>
+<% end %>
@@ -0,0 +1,29 @@
+<div class="description">
+  <%= @page.body %>
+</div>
+
+<% if @page.allow_create?(user) %>
+<div class="actions">
+  <%= link_to url_for({:controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Topic", :parent_id => @page.id}), :class => 'button with-text icon-add' do %>
+    <strong><%= _("New Topic") %></strong>
+  <% end %>
+</div>
+<% end %>
+
+<div class="topics">
+  <h3><%= _('Discussion Topics') %></h3>
+  <% @page.topics.includes(:profile).each do |topic| %>
+    <div class="topic">
+      <div class="topic-color" style="background-color: <%= topic.color %>;"></div>
+      <%= link_to topic.title, topic.view_url %>
+    </div>
+  <% end %>
+</div>
+
+<div class="actions">
+  <%= link_to url_for({:controller => 'proposals_discussion_plugin_myprofile', :action => 'select_topic', :parent_id => @page.id}), :class => 'button with-text icon-add' do %>
+    <strong><%= _("Send my proposal") %></strong>
+  <% end %>
+</div>
+
+<%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => @page} %>
@@ -0,0 +1,27 @@
+<div class="topic">
+  <h5><%= _('Discussion Topic') %></h5>
+  <div class="content"><%= @page.topic.title %></div>
+</div>
+
+<div class="title">
+  <h5><%= _('Title') %></h4>
+  <div class="content"><%= @page.title %></div>
+</div>
+
+<div class="abstract">
+  <h5><%= _('Abstract') %></h4>
+  <div class="content"><%= @page.abstract %></div>
+</div>
+
+<div class="body">
+  <h5><%= _('Body') %></h4>
+  <div class="content"><%= @page.body %></div>
+</div>
+
+<% if @page.allow_edit?(user) && !@page.published %>
+<div class="actions">
+  <%= link_to url_for({:controller => 'proposals_discussion_plugin_myprofile', :action => 'publish_proposal', :proposal_id => @page.id}), :class => 'button with-text icon-suggest' do %>
+    <strong><%= _("Publish") %></strong>
+  <% end %>
+</div>
+<% end %>
@@ -0,0 +1,33 @@
+<div class="description">
+  <%= @page.body %>
+</div>
+<h4><%= @page.discussion.title %></h4>
+
+<div class="proposals-count">
+  <span class="label"><%= _('Number of Proposals: ') %></span>
+  <span class="content"><%= @page.proposals.count %></span>
+</div>
+<div class="participants-count">
+  <span class="label"><%= _('Number of Participants: ') %></span>
+  <span class="content"><%= @page.proposals_authors.count %></span>
+</div>
+<div class="comments-count">
+  <span class="label"><%= _('Number of Comments: ') %></span>
+  <span class="content"><%= @page.proposals_comments.count %></span>
+</div>
+<div class="active-participants">
+  <span class="label"><%= _('Most active: ') %></span>
+  <span class="content">
+    <% @page.most_active_participants.each do |author| %>
+      <%= link_to profile_image(author, :icon), author.url, :title => author.name %>
+    <% end %>
+  </span>
+</div>
+
+<div class="actions">
+  <%= link_to url_for({:controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Proposal", :parent_id => @page.id}), :class => 'button with-text icon-add' do %>
+    <strong><%= _("Send my proposal") %></strong>
+  <% end %>
+</div>
+
+<%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => @page} %>
@@ -0,0 +1,37 @@
+<script>
+  jQuery(document).ready(function($){
+    $("#topics").accordion();
+    $('#topics input[type=radio],label').on('click',function(e){e.stopPropagation();});
+    $('#topics h4').click(function(e){
+      e.stopPropagation();
+      $(this).find('input:radio').prop('checked', true);
+    });
+  });
+</script>
+
+<div class="proposals-discussion-plugin select-topic">
+  <h1><%= @discussion.title %></h1>
+  <%= form_for :discussion, :url => {:controller => 'proposals_discussion_plugin_myprofile', :action => 'new_proposal'} do %>
+
+    <h3><%= _('Select topic') %></h3>
+    <div id="topics">
+
+      <% @discussion.children.each do |topic| %>
+        <h4>
+          <%= radio_button_tag('discussion[topic]', topic.id) %>
+          <%= topic.title %>
+        </h4>
+        <div class="content">
+          <%= topic.body %>
+        </div>
+      <% end %>
+
+      <div class="clear"></div>
+    </div>
+
+    <div class="actions">
+      <%= submit_button(:next, _('Next')) %>
+      <%= button :cancel, _('Cancel'), @discussion.view_url %>
+    </div>
+  <% end %>
+</div>
@@ -146,7 +146,7 @@ class FeaturesControllerTest &lt; ActionController::TestCase
     assert_equal true, e.custom_community_fields['contact_person']['required']
   end
-  should 'search members' do
+  should 'search members by name' do
     uses_host 'anhetegua.net'
     person = fast_create(Person, :environment_id => Environment.find(2).id)
     xhr :get, :search_members, :q => person.name[0..2]
@@ -154,4 +154,12 @@ class FeaturesControllerTest &lt; ActionController::TestCase
     assert_includes json_response, {"id"=>person.id, "name"=>person.name}
   end
+  should 'search members by identifier' do
+    uses_host 'anhetegua.net'
+    person = fast_create(Person, :name => 'Some Name', :identifier => 'person-identifier', :environment_id => Environment.find(2).id)
+    xhr :get, :search_members, :q => person.identifier
+    json_response = ActiveSupport::JSON.decode(@response.body)
+    assert_includes json_response, {"id"=>person.id, "name"=>person.name}
+  end
+
 end
@@ -31,4 +31,10 @@ class CategoriesHelperTest &lt; ActiveSupport::TestCase
     assert_equal '', category_color_style(category2)
   end
+  should 'not return category parent color if category is nil' do
+    assert_nothing_raised do
+      assert_equal '', category_color_style(nil)
+    end
+  end
+
 end
	@@ -93,7 +93,7 @@ class FeaturesController < AdminController		@@ -93,7 +93,7 @@ class FeaturesController < AdminController
93		93
94	def search_members	94	def search_members
95	arg = params[:q].downcase	95	arg = params[:q].downcase
96	- result = environment.people.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])	96	+ result = environment.people.find(:all, :conditions => ['LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%"])
97	render :text => prepare_to_token_input(result).to_json	97	render :text => prepare_to_token_input(result).to_json
98	end	98	end
99		99
	@@ -12,7 +12,7 @@ module CategoriesHelper		@@ -12,7 +12,7 @@ module CategoriesHelper
12	end	12	end
13		13
14	def category_color_style(category)	14	def category_color_style(category)
15	- return '' if category.display_color.blank?	15	+ return '' if category.nil? or category.display_color.blank?
16	'background-color: #'+category.display_color+';'	16	'background-color: #'+category.display_color+';'
17	end	17	end
18		18
	@@ -252,7 +252,7 @@ class Article < ActiveRecord::Base		@@ -252,7 +252,7 @@ class Article < ActiveRecord::Base
252	}	252	}
253		253
254	scope :public,	254	scope :public,
255	- :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], :joins => [:profile]	255	+ :conditions => [ "articles.advertise = ? AND articles.published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], :joins => [:profile]
256		256
257	scope :more_recent,	257	scope :more_recent,
258	:conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND	258	:conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
	1	+class ProposalsDiscussionPluginMyprofileController < MyProfileController
	2	+
	3	+ before_filter :check_edit_permission_to_proposal, :only => :publish_proposal
	4	+
	5	+ def select_topic
	6	+ @discussion = profile.articles.find(params[:parent_id])
	7	+ render :file => 'select_topic'
	8	+ end
	9	+
	10	+ def new_proposal
	11	+ redirect_to :controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Proposal", :parent_id => params[:discussion][:topic]
	12	+ end
	13	+
	14	+ def publish_proposal
	15	+ if @proposal.update_attribute(:published, true)
	16	+ session[:notice] = _('Proposal published!')
	17	+ else
	18	+ session[:notice] = _('Failed to publish your proposal.')
	19	+ end
	20	+ redirect_to @proposal.topic.view_url
	21	+ end
	22	+
	23	+ protected
	24	+
	25	+ def check_edit_permission_to_proposal
	26	+ @proposal = profile.articles.find(params[:proposal_id])
	27	+ render_access_denied unless @proposal.allow_edit?(user)
	28	+ end
	29	+
	30	+end
@@ -0,0 +1,43 @@		@@ -0,0 +1,43 @@
	1	+class ProposalsDiscussionPluginPublicController < ApplicationController
	2	+
	3	+ needs_profile
	4	+
	5	+ def load_proposals
	6	+ holder = profile.articles.find(params[:holder_id])
	7	+ page = (params[:page] \|\| 1).to_i
	8	+ set_rand_cookie if page == 1
	9	+ order = params[:order]
	10	+
	11	+ @proposals = order_proposals(holder.proposals.public, order)
	12	+ @proposals = @proposals.page(page).per_page(5)
	13	+
	14	+ unless @proposals.empty?
	15	+ render :partial => 'content_viewer/proposals_list_content', :locals => {:proposals => @proposals, :holder => holder, :page => page+1, :order => order}
	16	+ else
	17	+ render :text => ''
	18	+ end
	19	+ end
	20	+
	21	+ private
	22	+
	23	+ def order_proposals(proposals, order)
	24	+ case order
	25	+ when 'alphabetical'
	26	+ proposals.reorder('name')
	27	+ else
	28	+ set_seed
	29	+ proposals.reorder('random()')
	30	+ end
	31	+ end
	32	+
	33	+ def set_seed
	34	+ #XXX postgresql specific
	35	+ seed_val = profile.connection.quote(cookies[:_noosfero_proposals_discussion_rand_seed])
	36	+ profile.connection.execute("select setseed(#{seed_val})")
	37	+ end
	38	+
	39	+ def set_rand_cookie
	40	+ cookies[:_noosfero_proposals_discussion_rand_seed] = {value: rand, expires: Time.now + 600}
	41	+ end
	42	+
	43	+end
@@ -0,0 +1,43 @@		@@ -0,0 +1,43 @@
	1	+class ProposalsDiscussionPlugin < Noosfero::Plugin
	2	+
	3	+ def self.plugin_name
	4	+ 'Discussion of Proposals'
	5	+ end
	6	+
	7	+ def self.plugin_description
	8	+ _("Provide a structured way to promove a discussion over ideas proposed by users.")
	9	+ end
	10	+
	11	+ def stylesheet?
	12	+ true
	13	+ end
	14	+
	15	+ def content_types
	16	+ if context.respond_to?(:params) && context.params
	17	+ types = []
	18	+ parent_id = context.params[:parent_id]
	19	+ parent = parent_id ? context.profile.articles.find(parent_id) : nil
	20	+ types << ProposalsDiscussionPlugin::Discussion unless parent
	21	+ types << ProposalsDiscussionPlugin::Topic if parent.kind_of?(ProposalsDiscussionPlugin::Discussion)
	22	+ types << ProposalsDiscussionPlugin::Proposal if parent.kind_of?(ProposalsDiscussionPlugin::Topic)
	23	+ types
	24	+ else
	25	+ [ProposalsDiscussionPlugin::Discussion,
	26	+ ProposalsDiscussionPlugin::Topic,
	27	+ ProposalsDiscussionPlugin::Proposal]
	28	+ end
	29	+ end
	30	+
	31	+ def content_remove_new(page)
	32	+ page.kind_of?(ProposalsDiscussionPlugin::Discussion) \|\|
	33	+ page.kind_of?(ProposalsDiscussionPlugin::Topic) \|\|
	34	+ page.kind_of?(ProposalsDiscussionPlugin::Proposal)
	35	+ end
	36	+
	37	+ def content_remove_upload(page)
	38	+ page.kind_of?(ProposalsDiscussionPlugin::Discussion) \|\|
	39	+ page.kind_of?(ProposalsDiscussionPlugin::Topic) \|\|
	40	+ page.kind_of?(ProposalsDiscussionPlugin::Proposal)
	41	+ end
	42	+
	43	+end
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+class ProposalsDiscussionPlugin::Discussion < Folder
	2	+
	3	+ has_many :topics, :class_name => 'ProposalsDiscussionPlugin::Topic', :foreign_key => 'parent_id'
	4	+ has_many :proposals, :class_name => 'ProposalsDiscussionPlugin::Proposal', :through => :children, :source => :children
	5	+
	6	+ def self.short_description
	7	+ _("Discussion")
	8	+ end
	9	+
	10	+ def self.description
	11	+ _('Container for topics.')
	12	+ end
	13	+
	14	+ def to_html(options = {})
	15	+ proc do
	16	+ render :file => 'content_viewer/discussion'
	17	+ end
	18	+ end
	19	+
	20	+end
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+class ProposalsDiscussionPlugin::Proposal < TinyMceArticle
	2	+
	3	+ scope :private, lambda {\|user\| {:conditions => {:last_changed_by_id => user.id, :published => false}}}
	4	+
	5	+ alias :topic :parent
	6	+
	7	+ def self.short_description
	8	+ _("Proposal")
	9	+ end
	10	+
	11	+ def self.description
	12	+ _('Proposal')
	13	+ end
	14	+
	15	+ validates_presence_of :abstract
	16	+
	17	+
	18	+ def to_html(options = {})
	19	+ proc do
	20	+ render :file => 'content_viewer/proposal'
	21	+ end
	22	+ end
	23	+
	24	+ def allow_edit?(user)
	25	+ super \|\| created_by == user
	26	+ end
	27	+
	28	+end
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+module ProposalsDiscussionPlugin::ProposalHelper
	2	+
	3	+ def visibility_options(article, tokenized_children)
	4	+ article.published = false if article.new_record?
	5	+ super
	6	+ end
	7	+
	8	+end
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+module ProposalsDiscussionPlugin::ProposalsListHelper
	2	+
	3	+ def more_proposals(text, holder, order, page=1)
	4	+ link_to '', url_for({:controller => 'proposals_discussion_plugin_public', :action => 'load_proposals', :holder_id => holder.id, :profile => profile.identifier, :order => order, :page => page })
	5	+ end
	6	+
	7	+end