Merge branch 'stable' of https://gitlab.com/noosfero/noosfero into stable

Rodrigo Souto
2 parents 74d02a29 b6679024
Showing 8 changed files with 36 additions and 42 deletions Show diff stats
app/helpers/comment_helper.rb
app/helpers/content_viewer_helper.rb
app/models/uploaded_file.rb
app/views/blocks/profile_image.rhtml
db/migrate/20140221142304_move_title_virtual_field_to_name_in_uploaded_file.rb
plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
po/pt/noosfero.po
test/unit/uploaded_file_test.rb
@@ -2,7 +2,6 @@ module CommentHelper
   def article_title(article, args = {})
     title = article.title
-    title = article.display_title if article.kind_of?(UploadedFile) && article.image?
     title = content_tag('h1', h(title), :class => 'title')
     if article.belongs_to_blog?
       unless args[:no_link]
@@ -14,8 +14,7 @@ module ContentViewerHelper
   end
   def article_title(article, args = {})
-    title = article.display_title if article.kind_of?(UploadedFile) && article.image?
-    title = article.title if title.blank?
+    title = article.title
     title = content_tag('h1', h(title), :class => 'title')
     if article.belongs_to_blog? || article.belongs_to_forum?
       unless args[:no_link]
@@ -12,15 +12,12 @@ class UploadedFile &lt; Article
   include ShortFilename
-  settings_items :title, :type => 'string'
-  xss_terminate :only => [ :title ]
-
-  def title_with_default
-    title_without_default || short_filename(name, 60)
+  def title
+    if self.name.present? then self.name else self.filename end
+  end
+  def title= value
+    self.name = value
   end
-  alias_method_chain :title, :default
-
-  validates_size_of :title, :maximum => 60, :if => (lambda { |file| !file.title.blank? })
   sanitize_filename
@@ -32,10 +29,6 @@ class UploadedFile &lt; Article
     self.image? ? self.full_filename(:display).gsub(File.join(RAILS_ROOT, 'public'), '') : nil
   end
-  def display_title
-    title.blank? ? name : title
-  end
-
   def first_paragraph
     ''
   end
 <div class="vcard">
-<p><%= block.title %></p>
+<% if block.title.present? %>
+  <p><%= block.title %></p>
+<% end %>
 <div class="profile-big-image">
   <div class="profile-big-image-inner1">
@@ -0,0 +1,12 @@
+class MoveTitleVirtualFieldToNameInUploadedFile < ActiveRecord::Migration
+  def self.up
+    UploadedFile.find_each do |uploaded_file|
+      uploaded_file.name = uploaded_file.setting.delete :title
+      uploaded_file.send :update_without_callbacks
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
 <h1> <%= _('Basket options') %> </h1>
 <% form_for(:settings, @settings, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %>
-  <%= labelled_form_field(_('Enabled?'), f.check_box(:enabled)) %>
-  <%= labelled_form_field(_('Delivery?'), f.check_box(:delivery)) %>
+  <%= labelled_form_field(_('Enable shopping basket'), f.check_box(:enabled)) %>
+  <%= labelled_form_field(_('Enable delivery fields on orders'), f.check_box(:delivery)) %>
   <% display_delivery_settings = @settings.delivery ? 'auto' : 'none' %>
   <fieldset id='delivery_settings' style="display: <%= display_delivery_settings %>"><legend><%=_('Delivery')%></legend>
     <table>
@@ -33,8 +33,8 @@
       </tr>
     </table>
-    <%= labelled_form_field(_('Free delivery price:'), f.text_field(:free_delivery_price)) %>
-    <%= content_tag('small', _('Empty stands for no free delivery price.')) %>
+    <%= labelled_form_field(_("Order's minimum price for free delivery:"), f.text_field(:free_delivery_price)) %>
+    <%= content_tag('small', _('Leave empty to always charge the delivery.')) %>
   </fieldset>
   <br style='clear: both'/>
   <br style='clear: both'/>
@@ -7218,8 +7218,8 @@ msgstr &quot;Funcionalidade&quot;
 #: app/views/features/index.rhtml:16
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:4
-msgid "Enabled?"
-msgstr "Habilitada?"
+msgid "Enable shopping basket"
+msgstr "Habilitar cesto de compras"
 #: app/views/features/index.rhtml:27
 msgid "Configure features"
@@ -12292,8 +12292,8 @@ msgid &quot;Basket options&quot;
 msgstr "Opções do cesto"
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:5
-msgid "Delivery?"
-msgstr "Entrega?"
+msgid "Enable delivery fields on orders"
+msgstr "Ativar campos de entrega para pedidos"
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10
 msgid "Option"
@@ -12310,12 +12310,12 @@ msgid &quot;ADD NEW OPTION&quot;
 msgstr "ADCIONAR NOVA OPÇÂO"
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36
-msgid "Free delivery price:"
-msgstr "Preço de entrega grátis:"
+msgid "Order's minimum price for free delivery:"
+msgstr "Preço mínimo do pedido para entrega grátis:"
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37
-msgid "Empty stands for no free delivery price."
-msgstr "Vazio significa sem preço de frete grátis."
+msgid "Leave empty to always charge the delivery."
+msgstr "Deixe vazio para sempre cobrar a entrega."
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb:1
 msgid "Purchase Reports"
@@ -119,24 +119,13 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     assert_equal 'my title', UploadedFile.new(:title => 'my title').title
   end
-  should 'limit title to 140 characters' do
-    upload = UploadedFile.new
-
-    upload.title = '+' * 61; upload.valid?
-    assert upload.errors[:title]
-
-    upload.title = '+' * 60; upload.valid?
-    assert !upload.errors[:title]
-
-  end
-
   should 'always provide a display title' do
     upload = UploadedFile.new(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-    assert_equal 'test.txt',  upload.display_title
+    assert_equal 'test.txt',  upload.title
     upload.title = 'My text file'
-    assert_equal 'My text file', upload.display_title
+    assert_equal 'My text file', upload.title
     upload.title = ''
-    assert_equal 'test.txt', upload.display_title
+    assert_equal 'test.txt', upload.title
   end
   should 'use name as title by default' do
	@@ -2,7 +2,6 @@ module CommentHelper		@@ -2,7 +2,6 @@ module CommentHelper
2		2
3	def article_title(article, args = {})	3	def article_title(article, args = {})
4	title = article.title	4	title = article.title
5	- title = article.display_title if article.kind_of?(UploadedFile) && article.image?
6	title = content_tag('h1', h(title), :class => 'title')	5	title = content_tag('h1', h(title), :class => 'title')
7	if article.belongs_to_blog?	6	if article.belongs_to_blog?
8	unless args[:no_link]	7	unless args[:no_link]
1	<div class="vcard">	1	<div class="vcard">
2		2
3	-<p><%= block.title %></p>	3	+<% if block.title.present? %>
		4	+ <p><%= block.title %></p>
		5	+<% end %>
4		6
5	<div class="profile-big-image">	7	<div class="profile-big-image">
6	<div class="profile-big-image-inner1">	8	<div class="profile-big-image-inner1">
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class MoveTitleVirtualFieldToNameInUploadedFile < ActiveRecord::Migration
	2	+ def self.up
	3	+ UploadedFile.find_each do \|uploaded_file\|
	4	+ uploaded_file.name = uploaded_file.setting.delete :title
	5	+ uploaded_file.send :update_without_callbacks
	6	+ end
	7	+ end
	8	+
	9	+ def self.down
	10	+ say "this migration can't be reverted"
	11	+ end
	12	+end