Merge branch 'stable'

Rodrigo Souto
2 parents a6ea24fa beb05f86
Showing 21 changed files with 81 additions and 75 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/my_profile/manage_products_controller.rb
app/controllers/public/account_controller.rb
app/helpers/layout_helper.rb
app/helpers/manage_products_helper.rb
app/models/event.rb
app/models/user.rb
app/views/account/change_password.rhtml
app/views/layouts/application-ng.rhtml
app/views/profile_editor/edit.rhtml
debian/changelog
lib/noosfero.rb
lib/noosfero/plugin.rb
plugins/custom_forms/db/migrate/20130823151900_associate_fields_to_alternatives.rb
plugins/custom_forms/db/migrate/20140505131703_remove_submissions_without_form.rb
plugins/custom_forms/lib/custom_forms_plugin/form.rb
plugins/custom_forms/test/unit/custom_forms_plugin/form_test.rb
public/stylesheets/application.css
test/functional/account_controller_test.rb
test/functional/application_controller_test.rb
@@ -21,7 +21,8 @@ class ApplicationController &lt; ActionController::Base
   include ApplicationHelper
   layout :get_layout
   def get_layout
-    return nil if request.format == :js
+    return nil if request.format == :js or request.xhr?
+
     theme_layout = theme_option(:layout)
     if theme_layout
       theme_view_file('layouts/'+theme_layout) || theme_layout
@@ -48,6 +48,7 @@ class ManageProductsController &lt; ApplicationController
   end
   def new
+    @no_design_blocks = true
     @category = params[:selected_category_id] ? Category.find(params[:selected_category_id]) : nil
     @product = @profile.products.build(:product_category => @category)
     @categories = ProductCategory.top_level_for(environment)
@@ -135,12 +135,8 @@ class AccountController &lt; ApplicationController
                                params[:new_password_confirmation])
         session[:notice] = _('Your password has been changed successfully!')
         redirect_to :action => 'index'
-      rescue User::IncorrectPassword => e
-        session[:notice] = _('The supplied current password is incorrect.')
-        render :action => 'change_password'
+      rescue Exception
       end
-    else
-      render :action => 'change_password'
     end
   end
@@ -4,7 +4,7 @@ module LayoutHelper
     # Identify the current controller and action for the CSS:
     " controller-#{@controller.controller_name}" +
     " action-#{@controller.controller_name}-#{@controller.action_name}" +
-    " template-#{profile.nil? ? "default" : profile.layout_template}" +
+    " template-#{@layout_template || if profile.blank? then 'default' else profile.layout_template end}" +
     (!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "")
   end
@@ -26,27 +26,10 @@ module ManageProductsHelper
   def hierarchy_category_navigation(current_category, options = {})
     hierarchy = []
     if current_category
-      count_chars = 0
-      unless options[:hide_current_category]
-        hierarchy << current_category.name
-        count_chars += current_category.name.length
-      end
+      hierarchy << current_category.name unless options[:hide_current_category]
       ancestors = current_category.ancestors
-      toplevel = ancestors.pop
-      if toplevel
-        count_chars += toplevel.name.length
-      end
       ancestors.each do |category|
-        if count_chars > 55
-          hierarchy << hierarchy_category_item(category, options[:make_links], '( … )')
-          break
-        else
-          hierarchy << hierarchy_category_item(category, options[:make_links])
-        end
-        count_chars += category.name.length
-      end
-      if toplevel
-        hierarchy << hierarchy_category_item(toplevel, options[:make_links])
+        hierarchy << hierarchy_category_item(category, options[:make_links])
       end
     end
     hierarchy.reverse.join(options[:separator] || ' &rarr; ')
@@ -55,7 +38,7 @@ module ManageProductsHelper
   def options_for_select_categories(categories, selected = nil)
     categories.sort_by{|cat| cat.name.transliterate}.map do |category|
       selected_attribute = selected.nil? ? '' : (category == selected ? "selected='selected'" : '')
-      "<option value='#{category.id}' title='#{category.name}' #{selected_attribute}>#{truncate(category.name, :length => 33) + (category.leaf? ? '': ' &raquo;')}</option>"
+      "<option value='#{category.id}' title='#{category.name}' #{selected_attribute}>#{category.name + (category.leaf? ? '': ' &raquo;')}</option>"
     end.join("\n")
   end
@@ -102,20 +102,19 @@ class Event &lt; Article
     html = Builder::XmlMarkup.new(:target => result)
     html.div(:class => 'event-info' ) {
-
       html.ul(:class => 'event-data' ) {
         html.li(:class => 'event-dates' ) {
           html.span _('When:')
           html.text! show_period(start_date, end_date)
-        }
+        } if start_date.present? || end_date.present?
         html.li {
           html.span _('URL:')
           html.a(self.link || "", 'href' => self.link || "")
-        }
+        } if self.link.present?
         html.li {
           html.span _('Address:')
           html.text! self.address || ""
-        }
+        } if self.address.present?
       }
       # TODO: some good soul, please clean this ugly hack:
@@ -253,7 +253,10 @@ class User &lt; ActiveRecord::Base
   #   current password.
   # * Saves the record unless it is a new one.
   def change_password!(current, new, confirmation)
-    raise IncorrectPassword unless self.authenticated?(current)
+    unless self.authenticated?(current)
+      self.errors.add(:current_password, _('does not match.'))
+      raise IncorrectPassword
+    end
     self.force_change_password!(new, confirmation)
   end
 <h1><%= _('Change password') %></h1>
+<%= error_messages_for :user %>
+
 <% form_tag do %>
 <p><label for="password"><%= _('Current password') %></label><br/>
@@ -34,8 +34,8 @@
     <%# Add custom tags/styles/etc via content_for %>
     <%= yield :head %>
     <%=
-      @plugins.dispatch(:head_ending).collect do |content|
-        content.respond_to?(:call) ? content.call : content
+      @plugins.dispatch(:head_ending).map do |content|
+        if content.respond_to?(:call) then instance_eval(&content).html_safe else content.html_safe end
       end.join("\n")
     %>
@@ -47,8 +47,8 @@
     <a href="#content" id="link-go-content"><span><%= _("Go to the content") %></span></a>
     <%=
-      @plugins.dispatch(:body_beginning).collect do |content|
-        content.respond_to?(:call) ? content.call : content
+      @plugins.dispatch(:body_beginning).map do |content|
+        if content.respond_to?(:call) then instance_eval(&content).html_safe else content.html_safe end
       end.join("\n")
     %>
@@ -52,8 +52,8 @@
   )%>
   <%=
-    @plugins.dispatch(:profile_editor_extras).each do |content|
-      content.respond_to?(:call) ? content.call : content
+    @plugins.dispatch(:profile_editor_extras).map do |content|
+      if content.respond_to?(:call) then instance_eval(&content).html_safe else content.html_safe end
     end.join("\n")
   %>
+noosfero (0.47.1) unstable; urgency=low
+
+  * Bugfix release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Mon, 05 May 2014 19:10:51 +0000
+
 noosfero (0.47.0) unstable; urgency=low
   * New features release
@@ -2,7 +2,7 @@
 require 'fast_gettext'
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.47.0'
+  VERSION = '0.47.1'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -569,7 +569,7 @@ class Noosfero::Plugin
   def content_actions
     #FIXME 'new' and 'upload' only works for content_remove. It should work for
     #content_expire too.
-    %w[edit delete spread locale suggest home new upload]
+    %w[edit delete spread locale suggest home new upload undo]
   end
 end
@@ -15,14 +15,18 @@ class AssociateFieldsToAlternatives &lt; ActiveRecord::Migration
     end
     CustomFormsPlugin::Answer.find_each do |answer|
-      labels = []
-      answer.value.split(',').each do |value|
-        labels << answer.field.choices.invert[value]
-      end
-      labels.compact!
-      if labels.present?
-        answer.value = answer.field.alternatives.where('label IN (?)', labels).map(&:id).join(',')
-        answer.save!
+      # Avoid crash due to database possible inconsistency on submissions without form
+      begin
+        labels = []
+        answer.value.split(',').each do |value|
+          labels << answer.field.choices.invert[value]
+        end
+        labels.compact!
+        if labels.present?
+          answer.value = answer.field.alternatives.where('label IN (?)', labels).map(&:id).join(',')
+          answer.save!
+        end
+      rescue
       end
     end
@@ -0,0 +1,11 @@
+class RemoveSubmissionsWithoutForm < ActiveRecord::Migration
+  def self.up
+    CustomFormsPlugin::Submission.find_each do |submission|
+      submission.destroy if submission.form.nil?
+    end
+  end
+
+  def self.down
+    say "This migration is irreversible."
+  end
+end
@@ -4,7 +4,7 @@ class CustomFormsPlugin::Form &lt; Noosfero::Plugin::ActiveRecord
   has_many :fields, :order => 'position', :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy
   accepts_nested_attributes_for :fields, :allow_destroy => true
-  has_many :submissions, :class_name => 'CustomFormsPlugin::Submission'
+  has_many :submissions, :class_name => 'CustomFormsPlugin::Submission', :dependent => :destroy
   serialize :access
@@ -260,4 +260,18 @@ class CustomFormsPlugin::FormTest &lt; ActiveSupport::TestCase
     form2.destroy
     assert_includes Task.canceled, task2
   end
+
+  should 'destroy submissions after form is destroyed' do
+    form = CustomFormsPlugin::Form.create!(:profile => fast_create(Profile), :name => 'Free Software')
+    s1 = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
+    s2 = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
+    form.destroy
+
+    assert_raise ActiveRecord::RecordNotFound do
+      s1.reload
+    end
+    assert_raise ActiveRecord::RecordNotFound do
+      s2.reload
+    end
+  end
 end
@@ -3771,7 +3771,6 @@ h1#agenda-title {
   -webkit-border-radius: 5px;
   background: url(/images/ccc.gif); /* image ccc.gif from http://www.wannabegirl.org/translucent */
   padding: 10px 30px 20px 30px;
-  width: 570px;
 }
 #categories_container_wrapper {
   overflow-x: scroll;
@@ -203,6 +203,16 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_equal users(:ze), @controller.send(:current_user)
   end
+  should "not change password when new password and new password confirmation don't match" do
+    login_as 'ze'
+    post :change_password, :current_password => 'test', :new_password => 'blabla', :new_password_confirmation => 'blibli'
+    assert_response :success
+    assert_template 'change_password'
+    assert !assigns(:current_user).authenticated?('blabla')
+    assert !assigns(:current_user).authenticated?('blibli')
+    assert_equal users(:ze), @controller.send(:current_user)
+  end
+
   should 'provide a "I forget my password" link at the login page' do
     get :login
     assert_tag :tag => 'a', :attributes => {
@@ -418,11 +418,8 @@ class ApplicationControllerTest &lt; ActionController::TestCase
   should 'include content in the beginning of body supplied by plugins regardless it is a block or html code' do
     class TestBodyBeginning1Plugin < Noosfero::Plugin
-      def plugin1_method
-        '[[plugin1]]'
-      end
       def body_beginning
-        lambda {"<span id='plugin1'>This is #{plugin1_method} speaking!</span>"}
+        lambda {"<span id='plugin1'>This is [[plugin1]] speaking!</span>"}
       end
     end
     class TestBodyBeginning2Plugin < Noosfero::Plugin
@@ -442,11 +439,8 @@ class ApplicationControllerTest &lt; ActionController::TestCase
   should 'include content in the ending of head supplied by plugins regardless it is a block or html code' do
     class TestHeadEnding1Plugin < Noosfero::Plugin
-      def plugin1_method
-        '[[plugin1]]'
-      end
       def head_ending
-        lambda {"<script>alert('This is #{plugin1_method} speaking!')</script>"}
+        lambda {"<script>alert('This is [[plugin1]] speaking!')</script>"}
       end
     end
     class TestHeadEnding2Plugin < Noosfero::Plugin
@@ -13,23 +13,6 @@ class ManageProductsHelperTest &lt; ActiveSupport::TestCase
     @profile = create_user('blog_helper_test').person
   end
-  should 'omit second category when lenght of all names is over 60 chars' do
-    category_1 = fast_create(ProductCategory, :name => ('Category 1' * 5), :environment_id => @environment.id)
-    category_2 = fast_create(ProductCategory, :name => ('Category 2' * 5), :environment_id => @environment.id, :parent_id => category_1.id)
-    category_3 = fast_create(ProductCategory, :name => ('Category 3' * 5), :environment_id => @environment.id, :parent_id => category_2.id)
-
-    assert_match /Category 1/, hierarchy_category_navigation(category_3)
-    assert_no_match /Category 2/, hierarchy_category_navigation(category_3)
-  end
-
-  should 'show dots when lenght of all names is over 60 chars' do
-    category_1 = fast_create(ProductCategory, :name => ('Category 1' * 5), :environment_id => @environment.id)
-    category_2 = fast_create(ProductCategory, :name => ('Category 2' * 5), :environment_id => @environment.id, :parent_id => category_1.id)
-    category_3 = fast_create(ProductCategory, :name => ('Category 3' * 5), :environment_id => @environment.id, :parent_id => category_2.id)
-
-    assert_match /…/, hierarchy_category_navigation(category_3)
-  end
-
   should 'display select for categories' do
     category_1 = fast_create(ProductCategory, :name => 'Category 1', :environment_id => @environment.id)
     fast_create(ProductCategory, :name => 'Category 2.1', :environment_id => @environment.id, :parent_id => category_1.id)
	@@ -48,6 +48,7 @@ class ManageProductsController < ApplicationController		@@ -48,6 +48,7 @@ class ManageProductsController < ApplicationController
48	end	48	end
49		49
50	def new	50	def new
		51	+ @no_design_blocks = true
51	@category = params[:selected_category_id] ? Category.find(params[:selected_category_id]) : nil	52	@category = params[:selected_category_id] ? Category.find(params[:selected_category_id]) : nil
52	@product = @profile.products.build(:product_category => @category)	53	@product = @profile.products.build(:product_category => @category)
53	@categories = ProductCategory.top_level_for(environment)	54	@categories = ProductCategory.top_level_for(environment)
	@@ -4,7 +4,7 @@ module LayoutHelper		@@ -4,7 +4,7 @@ module LayoutHelper
4	# Identify the current controller and action for the CSS:	4	# Identify the current controller and action for the CSS:
5	" controller-#{@controller.controller_name}" +	5	" controller-#{@controller.controller_name}" +
6	" action-#{@controller.controller_name}-#{@controller.action_name}" +	6	" action-#{@controller.controller_name}-#{@controller.action_name}" +
7	- " template-#{profile.nil? ? "default" : profile.layout_template}" +	7	+ " template-#{@layout_template \|\| if profile.blank? then 'default' else profile.layout_template end}" +
8	(!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "")	8	(!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "")
9	end	9	end
10		10
	@@ -26,27 +26,10 @@ module ManageProductsHelper		@@ -26,27 +26,10 @@ module ManageProductsHelper
26	def hierarchy_category_navigation(current_category, options = {})	26	def hierarchy_category_navigation(current_category, options = {})
27	hierarchy = []	27	hierarchy = []
28	if current_category	28	if current_category
29	- count_chars = 0
30	- unless options[:hide_current_category]
31	- hierarchy << current_category.name
32	- count_chars += current_category.name.length
33	- end	29	+ hierarchy << current_category.name unless options[:hide_current_category]
34	ancestors = current_category.ancestors	30	ancestors = current_category.ancestors
35	- toplevel = ancestors.pop
36	- if toplevel
37	- count_chars += toplevel.name.length
38	- end
39	ancestors.each do \|category\|	31	ancestors.each do \|category\|
40	- if count_chars > 55
41	- hierarchy << hierarchy_category_item(category, options[:make_links], '( … )')
42	- break
43	- else
44	- hierarchy << hierarchy_category_item(category, options[:make_links])
45	- end
46	- count_chars += category.name.length
47	- end
48	- if toplevel
49	- hierarchy << hierarchy_category_item(toplevel, options[:make_links])	32	+ hierarchy << hierarchy_category_item(category, options[:make_links])
50	end	33	end
51	end	34	end
52	hierarchy.reverse.join(options[:separator] \|\| ' → ')	35	hierarchy.reverse.join(options[:separator] \|\| ' → ')
	@@ -55,7 +38,7 @@ module ManageProductsHelper		@@ -55,7 +38,7 @@ module ManageProductsHelper
55	def options_for_select_categories(categories, selected = nil)	38	def options_for_select_categories(categories, selected = nil)
56	categories.sort_by{\|cat\| cat.name.transliterate}.map do \|category\|	39	categories.sort_by{\|cat\| cat.name.transliterate}.map do \|category\|
57	selected_attribute = selected.nil? ? '' : (category == selected ? "selected='selected'" : '')	40	selected_attribute = selected.nil? ? '' : (category == selected ? "selected='selected'" : '')
58	- "<option value='#{category.id}' title='#{category.name}' #{selected_attribute}>#{truncate(category.name, :length => 33) + (category.leaf? ? '': ' »')}</option>"	41	+ "<option value='#{category.id}' title='#{category.name}' #{selected_attribute}>#{category.name + (category.leaf? ? '': ' »')}</option>"
59	end.join("\n")	42	end.join("\n")
60	end	43	end
61		44
1	<h1><%= _('Change password') %></h1>	1	<h1><%= _('Change password') %></h1>
2		2
		3	+<%= error_messages_for :user %>
		4	+
3	<% form_tag do %>	5	<% form_tag do %>
4		6
5	<p><label for="password"><%= _('Current password') %></label><br/>	7	<p><label for="password"><%= _('Current password') %></label><br/>
		1	+noosfero (0.47.1) unstable; urgency=low
		2	+
		3	+ * Bugfix release
		4	+
		5	+ -- Rodrigo Souto <rodrigo@colivre.coop.br> Mon, 05 May 2014 19:10:51 +0000
		6	+
1	noosfero (0.47.0) unstable; urgency=low	7	noosfero (0.47.0) unstable; urgency=low
2		8
3	* New features release	9	* New features release
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	require 'fast_gettext'	2	require 'fast_gettext'
3	module Noosfero	3	module Noosfero
4	PROJECT = 'noosfero'	4	PROJECT = 'noosfero'
5	- VERSION = '0.47.0'	5	+ VERSION = '0.47.1'
6		6
7	def self.pattern_for_controllers_in_directory(dir)	7	def self.pattern_for_controllers_in_directory(dir)
8	disjunction = controllers_in_directory(dir).join('\|')	8	disjunction = controllers_in_directory(dir).join('\|')
	@@ -569,7 +569,7 @@ class Noosfero::Plugin		@@ -569,7 +569,7 @@ class Noosfero::Plugin
569	def content_actions	569	def content_actions
570	#FIXME 'new' and 'upload' only works for content_remove. It should work for	570	#FIXME 'new' and 'upload' only works for content_remove. It should work for
571	#content_expire too.	571	#content_expire too.
572	- %w[edit delete spread locale suggest home new upload]	572	+ %w[edit delete spread locale suggest home new upload undo]
573	end	573	end
574		574
575	end	575	end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class RemoveSubmissionsWithoutForm < ActiveRecord::Migration
	2	+ def self.up
	3	+ CustomFormsPlugin::Submission.find_each do \|submission\|
	4	+ submission.destroy if submission.form.nil?
	5	+ end
	6	+ end
	7	+
	8	+ def self.down
	9	+ say "This migration is irreversible."
	10	+ end
	11	+end
	@@ -4,7 +4,7 @@ class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord		@@ -4,7 +4,7 @@ class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord
4	has_many :fields, :order => 'position', :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy	4	has_many :fields, :order => 'position', :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy
5	accepts_nested_attributes_for :fields, :allow_destroy => true	5	accepts_nested_attributes_for :fields, :allow_destroy => true
6		6
7	- has_many :submissions, :class_name => 'CustomFormsPlugin::Submission'	7	+ has_many :submissions, :class_name => 'CustomFormsPlugin::Submission', :dependent => :destroy
8		8
9	serialize :access	9	serialize :access
10		10
	@@ -260,4 +260,18 @@ class CustomFormsPlugin::FormTest < ActiveSupport::TestCase		@@ -260,4 +260,18 @@ class CustomFormsPlugin::FormTest < ActiveSupport::TestCase
260	form2.destroy	260	form2.destroy
261	assert_includes Task.canceled, task2	261	assert_includes Task.canceled, task2
262	end	262	end
		263	+
		264	+ should 'destroy submissions after form is destroyed' do
		265	+ form = CustomFormsPlugin::Form.create!(:profile => fast_create(Profile), :name => 'Free Software')
		266	+ s1 = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
		267	+ s2 = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
		268	+ form.destroy
		269	+
		270	+ assert_raise ActiveRecord::RecordNotFound do
		271	+ s1.reload
		272	+ end
		273	+ assert_raise ActiveRecord::RecordNotFound do
		274	+ s2.reload
		275	+ end
		276	+ end
263	end	277	end