Merge branch 'stable'

Rodrigo Souto
2 parents 3971931c 415d3eec
Showing 20 changed files with 113 additions and 18 deletions Show diff stats
app/controllers/public/catalog_controller.rb
app/helpers/catalog_helper.rb
app/models/spammer_logger.rb
app/views/search/_image.rhtml
db/migrate/20130304200849_add_default_value_to_product_highlighted.rb
db/schema.rb
debian/changelog
lib/noosfero.rb
plugins/custom_forms/lib/custom_forms_plugin/field.rb
plugins/custom_forms/lib/custom_forms_plugin/form.rb
plugins/custom_forms/test/unit/custom_forms_plugin/field_test.rb
plugins/custom_forms/test/unit/custom_forms_plugin/form_test.rb
plugins/require_auth_to_comment/public/hide_comment_form.js
plugins/shopping_cart/public/style.css
plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb
plugins/spaminator/lib/spaminator_plugin/spaminator.rb
po/pt/noosfero.po
public/stylesheets/search.css
test/functional/catalog_controller_test.rb
test/unit/article_test.rb
@@ -7,7 +7,7 @@ class CatalogController &lt; PublicController
   def index
     @category = params[:level] ? ProductCategory.find(params[:level]) : nil
     @products = @profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => params[:page])
-    @categories = ProductCategory.on_level(params[:level])
+    @categories = ProductCategory.on_level(params[:level]).order(:name)
   end
   protected
@@ -21,7 +21,7 @@ module CatalogHelper
   def category_sub_links(category)
     sub_categories = []
-    category.children.each do |sub_category|
+    category.children.order(:name).each do |sub_category|
       sub_categories << category_link(sub_category, true)
     end
     content_tag('ul', sub_categories) if sub_categories.size > 1
@@ -5,10 +5,10 @@ class SpammerLogger &lt; Logger
   def self.log(spammer_ip, object=nil)
     if object
       if object.kind_of?(Comment)
-        @logger << "[#{Time.now.strftime("%F %T %z")}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
+        @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
       end
     else
-        @logger << "[#{Time.now.strftime("%F %T %z")}] IP: #{spammer_ip}\n"
+        @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
     end
   end
@@ -28,8 +28,9 @@
     <div class="search-gallery-items">
       <% r = image.children.find(:all, :order => :updated_at, :conditions => ['type = ?', 'UploadedFile']).last(3) %>
       <% if r.length > 0 %>
-        <% r.each do |i| %>
-          <%= link_to '', i.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% i.public_filename(:thumb) %>
+        <% r.each_index do |i| img = r[i] %>
+          <%= link_to '', img.view_url, :class => "search-image-pic pic-num#{i+1}",
+                                        :style => 'background-image: url(%s)'% img.public_filename(:thumb) %>
         <% end %>
       <% else %>
         <div class="search-no-image"><span><%= _('No image') %></span></div>
@@ -0,0 +1,10 @@
+class AddDefaultValueToProductHighlighted < ActiveRecord::Migration
+  def self.up
+    change_column :products, :highlighted, :boolean, :default => false
+    execute('UPDATE products SET highlighted=(0>1) WHERE highlighted IS NULL;')
+  end
+
+  def self.down
+    say 'This migraiton is not reversible!'
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130111232201) do
+ActiveRecord::Schema.define(:version => 20130304200849) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -415,7 +415,7 @@ ActiveRecord::Schema.define(:version =&gt; 20130111232201) do
     t.datetime "updated_at"
     t.decimal  "discount"
     t.boolean  "available",           :default => true
-    t.boolean  "highlighted"
+    t.boolean  "highlighted",         :default => false
     t.integer  "unit_id"
     t.integer  "image_id"
   end
+noosfero (0.41.1) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Fri, 08 Mar 2013 11:33:11 -0300
+
 noosfero (0.41.0) unstable; urgency=low
   * Features version with anti spam-bot measures
@@ -2,7 +2,7 @@ require &#39;fast_gettext&#39;
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.41.0'
+  VERSION = '0.41.1'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -4,7 +4,7 @@ class CustomFormsPlugin::Field &lt; ActiveRecord::Base
   validates_presence_of :form, :name
   validates_uniqueness_of :slug, :scope => :form_id
-  belongs_to :form, :class_name => 'CustomFormsPlugin::Form', :dependent => :destroy
+  belongs_to :form, :class_name => 'CustomFormsPlugin::Form'
   has_many :answers, :class_name => 'CustomFormsPlugin::Answer'
   serialize :choices, Hash
 class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord
   belongs_to :profile
-  has_many :fields, :class_name => 'CustomFormsPlugin::Field'
+  has_many :fields, :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy
   has_many :submissions, :class_name => 'CustomFormsPlugin::Submission'
   serialize :access
@@ -60,5 +60,16 @@ class CustomFormsPlugin::FieldTest &lt; ActiveSupport::TestCase
     assert_equal 2, field.choices['Second']
     assert_equal 3, field.choices['Third']
   end
+
+  should 'not destroy form after removing a field' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    license_field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    url_field = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form)
+
+    assert_no_difference CustomFormsPlugin::Form, :count do
+      url_field.destroy
+    end
+    assert_equal form.fields, [license_field]
+  end
 end
@@ -169,4 +169,15 @@ class CustomFormsPlugin::FormTest &lt; ActiveSupport::TestCase
     assert_includes scope, f2
     assert_not_includes scope, f3
   end
+
+  should 'destroy fields after removing a form' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    license_field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    url_field = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form)
+
+    assert_difference CustomFormsPlugin::Field, :count, -2 do
+      form.destroy
+    end
+  end
+
 end
 (function($) {
   $(window).bind('userDataLoaded', function(event, data) {
-    if (data.login || $('meta[name=profile.allow_unauthenticated_comments]').length > 0) {
+    if (data.login || $('meta[name="profile.allow_unauthenticated_comments"]').length > 0) {
       $('.post-comment-button').show();
       $('#page-comment-form').show();
       $('.comment-footer').show();
@@ -209,7 +209,7 @@ label.error {
   padding-left: 5px;
 }
-#order-filter {
+#cart-order-filter {
   background-color: #ccc;
   border: 1px solid #aaa;
   border-radius: 5px;
@@ -6,7 +6,7 @@
 <% status_collection = [[nil, _('All')]] %>
 <% status_collection += status.map{|s| [pos+=1, s] } %>
-<% form_tag({}, {:id => 'order-filter'}) do %>
+<% form_tag({}, {:id => 'cart-order-filter'}) do %>
   <%= labelled_text_field(_('From')+' ', :from, @from.strftime("%Y-%m-%d"), :id => 'from', :size => 9) %>
   <%= labelled_text_field(_('to')+' ', :to, @to.strftime("%Y-%m-%d"), :id => 'to', :size => 9) %>
   <span style="white-space:nowrap"><%= labelled_select(_('Status')+' ', :filter_status, :first, :last, @status,  status_collection)%></span>
@@ -15,12 +15,12 @@ class SpaminatorPlugin::Spaminator
     def initialize_logger(environment)
       logdir = File.join(RAILS_ROOT, 'log', SpaminatorPlugin.name.underscore)
       File.makedirs(logdir) if !File.exist?(logdir)
-      logpath = File.join(logdir, "#{environment.name.to_slug}_#{ENV['RAILS_ENV']}_#{Time.now.strftime("%F_%T")}.log")
+      logpath = File.join(logdir, "#{environment.name.to_slug}_#{ENV['RAILS_ENV']}_#{Time.now.strftime('%F_%T')}.log")
       @logger = Logger.new(logpath)
     end
     def log(message)
-      @logger << "[#{Time.now.strftime("%F %T %z")}] #{message}\n"
+      @logger << "[#{Time.now.strftime('%F %T %z')}] #{message}\n"
     end
   end
@@ -5497,7 +5497,7 @@ msgstr &quot;Produto destacado&quot;
 #: app/views/catalog/index.rhtml:42 app/views/search/_image.rhtml:35
 #: app/views/search/_image.rhtml:47
 msgid "No image"
-msgstr "Nenhum imagem"
+msgstr "Nenhuma imagem"
 #: app/views/catalog/index.rhtml:52
 msgid "from "
@@ -736,10 +736,18 @@ li.search-product-item hr {
   min-height: 98px;
   position: absolute;
 }
+.search-gallery .search-content-first-column {
+  width: 190px;
+}
+
 .search-content-second-column {
   margin-left: 140px;
   width: auto;
 }
+.search-gallery .search-content-second-column {
+  margin-left: 200px;
+}
+
 .search-content-second-column tr:hover {
   background-color: none;
 }
@@ -807,15 +815,45 @@ a.search-image-pic {
   display: table-cell;
   vertical-align: middle;
 }
+
 .search-gallery-items a.search-image-pic {
   float:left;
   margin:0 2px;
 }
+
+
 .search-gallery .search-gallery-items {
   float: left;
-  margin: 0 10px 0 0;
+  margin: 0;
   min-width: 130px;
+  position: relative;
 }
+
+.search-gallery .search-gallery-items a.search-image-pic {
+  border: none;
+  border-radius: 0;
+  box-shadow: none;
+  width: 62px;
+  margin: 0px 0px 1px 1px;
+  background-size: cover;
+  background-position: 50% 10%;
+  float: none;
+}
+
+.search-gallery .search-gallery-items a.search-image-pic.pic-num1,
+.search-gallery .search-gallery-items a.search-image-pic.pic-num2 {
+  display: block;
+  width: 60px;
+  height: 49px;
+}
+.search-gallery .search-gallery-items a.search-image-pic.pic-num3 {
+  width: 130px;
+  height: 99px;
+  position: absolute;
+  left: 61px;
+  top: 0px;
+}
+
 .search-content-first-column .search-image-container .search-image-pic
 .search-uploaded-file-first-column .search-image-container .search-image-pic {
   display: block;
@@ -224,4 +224,21 @@ class CatalogControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'li', :attributes => {:id => "product-#{p2.id}", :class => /not-available/}
   end
+  should 'sort categories by name' do
+    environment = @enterprise.environment
+    environment.categories.destroy_all
+    pc1 = ProductCategory.create!(:name => "Drinks", :environment => environment)
+    pc2 = ProductCategory.create!(:name => "Bananas", :environment => environment)
+    pc3 = ProductCategory.create!(:name => "Sodas", :environment => environment)
+    pc4 = ProductCategory.create!(:name => "Pies", :environment => environment)
+    p1 = fast_create(Product, :product_category_id => pc1.id, :enterprise_id => @enterprise.id)
+    p2 = fast_create(Product, :product_category_id => pc2.id, :enterprise_id => @enterprise.id)
+    p3 = fast_create(Product, :product_category_id => pc3.id, :enterprise_id => @enterprise.id)
+    p4 = fast_create(Product, :product_category_id => pc4.id, :enterprise_id => @enterprise.id)
+
+    get :index, :profile => @enterprise.identifier
+
+    assert_equal [pc2, pc1, pc4, pc3], assigns(:categories)
+  end
+
 end
@@ -1371,6 +1371,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     a = profile.articles.create!(:name => 'a test article', :last_changed_by => author)
     assert_equal author.name, a.author_name
     author.destroy
+    a.reload
     a.author_name = 'some name'
     assert_equal 'some name', a.author_name
   end
	@@ -7,7 +7,7 @@ class CatalogController < PublicController		@@ -7,7 +7,7 @@ class CatalogController < PublicController
7	def index	7	def index
8	@category = params[:level] ? ProductCategory.find(params[:level]) : nil	8	@category = params[:level] ? ProductCategory.find(params[:level]) : nil
9	@products = @profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => params[:page])	9	@products = @profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => params[:page])
10	- @categories = ProductCategory.on_level(params[:level])	10	+ @categories = ProductCategory.on_level(params[:level]).order(:name)
11	end	11	end
12		12
13	protected	13	protected
	@@ -21,7 +21,7 @@ module CatalogHelper		@@ -21,7 +21,7 @@ module CatalogHelper
21		21
22	def category_sub_links(category)	22	def category_sub_links(category)
23	sub_categories = []	23	sub_categories = []
24	- category.children.each do \|sub_category\|	24	+ category.children.order(:name).each do \|sub_category\|
25	sub_categories << category_link(sub_category, true)	25	sub_categories << category_link(sub_category, true)
26	end	26	end
27	content_tag('ul', sub_categories) if sub_categories.size > 1	27	content_tag('ul', sub_categories) if sub_categories.size > 1
	@@ -5,10 +5,10 @@ class SpammerLogger < Logger		@@ -5,10 +5,10 @@ class SpammerLogger < Logger
5	def self.log(spammer_ip, object=nil)	5	def self.log(spammer_ip, object=nil)
6	if object	6	if object
7	if object.kind_of?(Comment)	7	if object.kind_of?(Comment)
8	- @logger << "[#{Time.now.strftime("%F %T %z")}] Comment-id: #{object.id} IP: #{spammer_ip}\n"	8	+ @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
9	end	9	end
10	else	10	else
11	- @logger << "[#{Time.now.strftime("%F %T %z")}] IP: #{spammer_ip}\n"	11	+ @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
12	end	12	end
13	end	13	end
14		14
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+class AddDefaultValueToProductHighlighted < ActiveRecord::Migration
	2	+ def self.up
	3	+ change_column :products, :highlighted, :boolean, :default => false
	4	+ execute('UPDATE products SET highlighted=(0>1) WHERE highlighted IS NULL;')
	5	+ end
	6	+
	7	+ def self.down
	8	+ say 'This migraiton is not reversible!'
	9	+ end
	10	+end
	@@ -9,7 +9,7 @@		@@ -9,7 +9,7 @@
9	#	9	#
10	# It's strongly recommended to check this file into your version control system.	10	# It's strongly recommended to check this file into your version control system.
11		11
12	-ActiveRecord::Schema.define(:version => 20130111232201) do	12	+ActiveRecord::Schema.define(:version => 20130304200849) do
13		13
14	create_table "abuse_reports", :force => true do \|t\|	14	create_table "abuse_reports", :force => true do \|t\|
15	t.integer "reporter_id"	15	t.integer "reporter_id"
	@@ -415,7 +415,7 @@ ActiveRecord::Schema.define(:version => 20130111232201) do		@@ -415,7 +415,7 @@ ActiveRecord::Schema.define(:version => 20130111232201) do
415	t.datetime "updated_at"	415	t.datetime "updated_at"
416	t.decimal "discount"	416	t.decimal "discount"
417	t.boolean "available", :default => true	417	t.boolean "available", :default => true
418	- t.boolean "highlighted"	418	+ t.boolean "highlighted", :default => false
419	t.integer "unit_id"	419	t.integer "unit_id"
420	t.integer "image_id"	420	t.integer "image_id"
421	end	421	end
		1	+noosfero (0.41.1) unstable; urgency=low
		2	+
		3	+ * Bugfixes release
		4	+
		5	+ -- Rodrigo Souto <rodrigo@colivre.coop.br> Fri, 08 Mar 2013 11:33:11 -0300
		6	+
1	noosfero (0.41.0) unstable; urgency=low	7	noosfero (0.41.0) unstable; urgency=low
2		8
3	* Features version with anti spam-bot measures	9	* Features version with anti spam-bot measures
	@@ -2,7 +2,7 @@ require 'fast_gettext'		@@ -2,7 +2,7 @@ require 'fast_gettext'
2		2
3	module Noosfero	3	module Noosfero
4	PROJECT = 'noosfero'	4	PROJECT = 'noosfero'
5	- VERSION = '0.41.0'	5	+ VERSION = '0.41.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('\|')
	@@ -4,7 +4,7 @@ class CustomFormsPlugin::Field < ActiveRecord::Base		@@ -4,7 +4,7 @@ class CustomFormsPlugin::Field < ActiveRecord::Base
4	validates_presence_of :form, :name	4	validates_presence_of :form, :name
5	validates_uniqueness_of :slug, :scope => :form_id	5	validates_uniqueness_of :slug, :scope => :form_id
6		6
7	- belongs_to :form, :class_name => 'CustomFormsPlugin::Form', :dependent => :destroy	7	+ belongs_to :form, :class_name => 'CustomFormsPlugin::Form'
8	has_many :answers, :class_name => 'CustomFormsPlugin::Answer'	8	has_many :answers, :class_name => 'CustomFormsPlugin::Answer'
9		9
10	serialize :choices, Hash	10	serialize :choices, Hash
1	class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord	1	class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord
2	belongs_to :profile	2	belongs_to :profile
3		3
4	- has_many :fields, :class_name => 'CustomFormsPlugin::Field'	4	+ has_many :fields, :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy
5	has_many :submissions, :class_name => 'CustomFormsPlugin::Submission'	5	has_many :submissions, :class_name => 'CustomFormsPlugin::Submission'
6		6
7	serialize :access	7	serialize :access
	@@ -60,5 +60,16 @@ class CustomFormsPlugin::FieldTest < ActiveSupport::TestCase		@@ -60,5 +60,16 @@ class CustomFormsPlugin::FieldTest < ActiveSupport::TestCase
60	assert_equal 2, field.choices['Second']	60	assert_equal 2, field.choices['Second']
61	assert_equal 3, field.choices['Third']	61	assert_equal 3, field.choices['Third']
62	end	62	end
		63	+
		64	+ should 'not destroy form after removing a field' do
		65	+ form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
		66	+ license_field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
		67	+ url_field = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form)
		68	+
		69	+ assert_no_difference CustomFormsPlugin::Form, :count do
		70	+ url_field.destroy
		71	+ end
		72	+ assert_equal form.fields, [license_field]
		73	+ end
63	end	74	end
64		75