Merge branch 'master' into not_destroy_user_with_moderate_task

Leandro Santos
2 parents e8e5c33a 1be73178
Showing 18 changed files with 135 additions and 137 deletions Show diff stats
app/helpers/cms_helper.rb
app/models/add_friend.rb
app/models/main_block.rb
app/models/person.rb
app/views/cms/_upload_file.html.erb
app/views/cms/_upload_file_form.html.erb
app/views/layouts/application-ng.html.erb
plugins/custom_forms/lib/custom_forms_plugin/submission.rb
plugins/custom_forms/test/functional/custom_forms_plugin_profile_controller_test.rb
po/de/noosfero.po
po/it/noosfero-doc.po
po/it/noosfero.po
po/pt/noosfero.po
public/javascripts/application.js
test/functional/profile_design_controller_test.rb
test/unit/add_friend_test.rb
test/unit/main_block_test.rb
test/unit/person_test.rb
@@ -9,12 +9,6 @@ module CmsHelper
     mime_type.gsub('/', '_').gsub('-', '')
   end
-  def add_upload_file_field(name, locals)
-    button_to_function :add, name, nil do |page|
-      page.insert_html :bottom, :uploaded_files, CGI::escapeHTML(render(:partial => 'upload_file', :locals => locals, :object => UploadedFile.new))
-    end
-  end
-
   def pagination_links(collection, options={})
     options = {:previous_label => '&laquo; ', :next_label => ' &raquo;', :page_links => false}.merge(options)
     will_paginate(collection, options)
@@ -4,7 +4,7 @@ class AddFriend &lt; Task
   validates_presence_of :requestor_id, :target_id
-  validates_uniqueness_of :target_id, :scope => [ :requestor_id ]
+  validates_uniqueness_of :target_id, scope: [ :requestor_id, :status ], if: proc{ |t| t.status == Task::Status::ACTIVE }
   validates_length_of :group_for_person, :group_for_friend, :maximum => 150, :allow_nil => true
@@ -24,4 +24,10 @@ class MainBlock &lt; Block
     ['always', 'except_home_page']
   end
+  def display_user_options
+    @display_user_options = {
+      'all'            => _('All users')
+    }
+  end
+
 end
@@ -150,7 +150,7 @@ roles] }
   end
   def already_request_friendship?(person)
-    person.tasks.find_by_requestor_id(self.id, :conditions => { :type => 'AddFriend' })
+    person.tasks.where(requestor_id: self.id, type: 'AddFriend', status: Task::Status::ACTIVE).first
   end
   def remove_friend(friend)
 <p><%= file_field_tag('uploaded_files[]', :size => size) %></p>
-<%= javascript_tag("jQuery('#uploaded_files')[0].scrollTop = jQuery('#uploaded_files')[0].scrollHeight") %>
@@ -13,7 +13,7 @@
 <%= hidden_field_tag('back_to', @back_to) %>
 <% button_bar do %>
-  <%= add_upload_file_field(_('More files'), {:size => size}) %>
+  <%= button_to_function :add, _('More files'), "add_new_file_fields()" %>
   <% if @back_to %>
     <%= submit_button :save, _('Upload'), :cancel => @back_to %>
   <% else %>
@@ -5,7 +5,6 @@
     <%= yield(:feeds) %>
     <!--<meta http-equiv="refresh" content="1"/>-->
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <meta name="description" content="<%= @environment.name %>" />
     <!-- site root -->
     <meta property="noosfero:root" content="<%= Noosfero.root %>"/>
@@ -5,7 +5,7 @@ class CustomFormsPlugin::Submission &lt; Noosfero::Plugin::ActiveRecord
   # validation is done manually, see below
   has_many :answers, :class_name => 'CustomFormsPlugin::Answer', :dependent => :destroy, :validate => false
-  attr_accessible :form, :profile
+  attr_accessible :form, :profile, :author_name, :author_email
   validates_presence_of :form
   validates_presence_of :author_name, :author_email, :if => lambda {|submission| submission.profile.nil?}
@@ -13,13 +13,16 @@ class CustomFormsPlugin::Submission &lt; Noosfero::Plugin::ActiveRecord
   validates_format_of :author_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|submission| !submission.author_email.blank?})
   validate :check_answers
-  def self.human_attribute_name(attrib)
-    if /\d+/ =~ attrib and (f = CustomFormsPlugin::Field.find_by_id(attrib.to_i))
+  def self.human_attribute_name_with_customization(attrib, options={})
+    if /\d+/ =~ attrib and (f = CustomFormsPlugin::Field.find_by_id(attrib.to_s))
       f.name
     else
-      attrib
+      _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
   before_create do |submission|
     if submission.profile
@@ -40,6 +40,19 @@ class CustomFormsPluginProfileControllerTest &lt; ActionController::TestCase
     assert_redirected_to :action => 'show'
   end
+  should 'display errors if user is not logged in and author_name is not uniq' do
+    logout
+    form = CustomFormsPlugin::Form.create(:profile => profile, :name => 'Free Software')
+    field = CustomFormsPlugin::TextField.create(:name => 'Name', :form => form)
+    submission = CustomFormsPlugin::Submission.create(:form => form, :author_name => "john", :author_email => 'john@example.com')
+
+    assert_no_difference 'CustomFormsPlugin::Submission.count' do
+      post :show, :profile => profile.identifier, :id => form.id, :author_name => "john", :author_email => 'john@example.com', :submission => {field.id.to_s => 'Noosfero'}
+    end
+    assert_equal "Submission could not be saved", session[:notice]
+    assert_tag :tag => 'div', :attributes => { :class => 'errorExplanation', :id => 'errorExplanation' }
+  end
+
   should 'disable fields if form expired' do
     form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :begining => Time.now + 1.day)
     form.fields << CustomFormsPlugin::TextField.create(:name => 'Field Name', :form => form, :default_value => "First Field")
@@ -2942,10 +2942,6 @@ msgstr &quot;Karte&quot;
 msgid "Full"
 msgstr "Vollständig"
-#: app/helpers/search_helper.rb:104
-msgid "Display"
-msgstr "Anzeige"
-
 #: app/helpers/search_helper.rb:118 app/helpers/users_helper.rb:16
 #: app/views/tasks/index.html.erb:26 app/views/tasks/index.html.erb:41
 #: app/views/memberships/index.html.erb:16
@@ -3000,19 +2996,6 @@ msgstr &quot;Aktivere Unternehmen aus dem Netzwerk&quot;
 msgid "More popular enterprises from network"
 msgstr "Beliebtere Unternehmen aus dem Netzwerk"
-#: app/helpers/search_helper.rb:23 app/helpers/search_helper.rb:113
-#, fuzzy
-msgid "Compact"
-msgstr "Berechnung"
-
-#: app/helpers/search_helper.rb:55
-msgid ", "
-msgstr ", "
-
-#: app/helpers/search_helper.rb:56
-msgid "search in all categories"
-msgstr "In allen Kategorien suchen"
-
 #: app/helpers/boxes_helper.rb:106
 msgid "This block is invisible. Your visitors will not see it."
 msgstr "Dieser Bereich ist nicht sichtbar. Ihre Kunden werden ihn nicht sehen."
@@ -3389,11 +3372,6 @@ msgstr &quot;Aktiviert um&quot;
 msgid "Deativated users"
 msgstr "Nutzer verwalten"
-#: app/helpers/users_helper.rb:16 app/views/tasks/index.html.erb:26
-#: app/views/tasks/index.html.erb:41 app/views/memberships/index.html.erb:16
-msgid "Filter"
-msgstr "Filter"
-
 #: app/helpers/forms_helper.rb:62
 msgid "Select the State"
 msgstr "Wählen Sie das Bundesland"
@@ -9909,45 +9887,6 @@ msgstr &quot;&quot;
 "\">GNU Affero General Public License</a> Version 3 oder einer späteren "
 "Version lizenziert ist."
-#~ msgid "More recent contents from network"
-#~ msgstr "Neueste Inhalte aus dem Netzwerk"
-
-#~ msgid "More viewed contents from network"
-#~ msgstr "Meistgesehene Inhalte aus dem Netzwerk"
-
-#~ msgid "Most commented contents from network"
-#~ msgstr "Meistkommentierte Inhalte aus dem Netzwerk"
-
-#~ msgid "More recent people from network"
-#~ msgstr "Neuere Leute aus dem Netzwerk"
-
-#~ msgid "More active people from network"
-#~ msgstr "Aktivere Leute aus dem Netzwerk"
-
-#~ msgid "More popular people from network"
-#~ msgstr "Populärere Leute aus dem Netzwerk"
-
-#~ msgid "More recent communities from network"
-#~ msgstr "Neuere Gemeinschaften aus dem Netzwerk"
-
-#~ msgid "More active communities from network"
-#~ msgstr "Aktivere Gemeinschaften aus dem Netzwerk"
-
-#~ msgid "More popular communities from network"
-#~ msgstr "Populärere Gemeinschaften aus dem Netzwerk"
-
-#, fuzzy
-#~ msgid "More recent enterprises from network"
-#~ msgstr "Neueste Inhalte aus dem Netzwerk"
-
-#, fuzzy
-#~ msgid "More active enterprises from network"
-#~ msgstr "Aktivere Leute aus dem Netzwerk"
-
-#, fuzzy
-#~ msgid "More popular enterprises from network"
-#~ msgstr "Populärere Leute aus dem Netzwerk"
-
 #~ msgid "starting chat with %{name}"
 #~ msgstr "starte Chat mit  %{name}"
@@ -3,18 +3,20 @@
 # This file is distributed under the same license as noosfero itself.
 # Daniela Feitosa <danielafeitos@colivre.coop.br>, 2012.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.36.6\n"
 "POT-Creation-Date: 2013-12-10 15:48-0300\n"
-"PO-Revision-Date: 2014-03-23 17:10-0300\n"
-"Last-Translator: Daniela Feitosa <danielafeitosa@colivre.coop.br>\n"
-"Language-Team: LANGUAGE TEAM <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2015-03-16 22:47+0200\n"
+"Last-Translator: TWS <tablettws@gmail.com>\n"
+"Language-Team: Italian "
+"<https://hosted.weblate.org/projects/noosfero/documentation/it/>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.3-dev\n"
 #. type: Content of: <h1>
 #: doc/noosfero/plugins/send_email.en.xhtml:1
@@ -1274,7 +1276,7 @@ msgstr &quot;&quot;
 #: doc/noosfero/user/sending-messages.en.xhtml:14
 #: doc/noosfero/user/sending-scraps.en.xhtml:13
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 #. type: Content of: <ol><li>
 #: doc/noosfero/enterprise/editing-appearance.en.xhtml:18
@@ -7,28 +7,28 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.0-690-gcb6e853\n"
 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
-"PO-Revision-Date: 2014-10-30 14:14+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Italian <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/it/>\n"
+"PO-Revision-Date: 2015-03-16 23:06+0200\n"
+"Last-Translator: TWS <tablettws@gmail.com>\n"
+"Language-Team: Italian "
+"<https://hosted.weblate.org/projects/noosfero/noosfero/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.0-dev\n"
+"X-Generator: Weblate 2.3-dev\n"
 #: app/models/approve_comment.rb:17
 msgid "Anonymous"
-msgstr ""
+msgstr "Anonimo"
 #: app/models/approve_comment.rb:25 app/models/approve_article.rb:17
 msgid "Article removed."
-msgstr ""
+msgstr "Articolo Rimosso."
 #: app/models/approve_comment.rb:33
 msgid "New comment to article"
-msgstr ""
+msgstr "Nuovo Commento nell'articolo"
 #: app/models/approve_comment.rb:49 app/models/approve_comment.rb:51
 msgid "%{requestor} commented on the article: %{linked_subject}."
@@ -36,7 +36,7 @@ msgstr &quot;&quot;
 #: app/models/approve_comment.rb:55 app/models/approve_article.rb:77
 msgid "The article was removed."
-msgstr ""
+msgstr "L'articolo è stato rimosso."
 #: app/models/approve_comment.rb:81
 msgid "%{requestor} wants to comment the article: %{article}."
@@ -50,6 +50,8 @@ msgstr &quot;&quot;
 msgid ""
 "You need to login on %{system} in order to approve or reject this comment."
 msgstr ""
+"Devi connetterti su %{system} per poter approvare oppure rigettare questo "
+"commento."
 #: app/models/approve_comment.rb:94
 msgid ""
@@ -58,14 +60,21 @@ msgid &quot;&quot;
 "\n"
 "%{comment} "
 msgstr ""
+"Il tuo commento su questo articolo \"%{article}\" è stato approvato. Ecco "
+"qui il commento lasciato dall'Amministratore che ha approvato il tuo "
+"commentot:↵\n"
+"↵\n"
+"%{comment} "
 #: app/models/approve_comment.rb:96
 msgid "Your request for comment the article \"%{article}\" was approved."
 msgstr ""
+"La richiesta per commentare questo articolo \"%{article}\" è stata approvata."
 #: app/models/approve_comment.rb:101
 msgid "Your request for commenting the article \"%{article}\" was rejected."
 msgstr ""
+"La richiesta per commentare questo articolo \"%{article}\" è stata rigettata."
 #: app/models/approve_comment.rb:103
 msgid ""
@@ -74,6 +83,10 @@ msgid &quot;&quot;
 "\n"
 "%{reject_explanation}"
 msgstr ""
+"Ecco la spiegazione del rigetto lasciata dall' Amministratore che ha "
+"rigettato il tuo commento: ↵\n"
+"↵\n"
+"%{reject_explanation}"
 #: app/models/comment.rb:4 app/models/article.rb:171
 #: app/views/content_viewer/_comment_form.html.erb:70
@@ -91,7 +104,7 @@ msgstr &quot;&quot;
 #: app/views/cms/publish.html.erb:43 app/views/cms/publish.html.erb:59
 #: app/views/comment/_comment_form.html.erb:77
 msgid "Title"
-msgstr ""
+msgstr "Titolo"
 #: app/models/comment.rb:5 app/models/product.rb:4 app/models/category.rb:6
 #: app/models/article.rb:16 app/models/profile.rb:15
@@ -111,12 +124,12 @@ msgstr &quot;&quot;
 #: app/views/enterprise_validation/_details.html.erb:3
 #: app/views/contact/sender/notification.html.erb:11
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 #: app/models/comment.rb:6 app/models/article.rb:18 app/models/article.rb:38
 #: app/models/scrap.rb:6
 msgid "Content"
-msgstr ""
+msgstr "Contenuto"
 #: app/models/comment.rb:32
 msgid "{fn} can only be informed for unauthenticated authors"
@@ -124,11 +137,11 @@ msgstr &quot;&quot;
 #: app/models/comment.rb:71
 msgid "(removed user)"
-msgstr ""
+msgstr "(utente rimosso)"
 #: app/models/comment.rb:71
 msgid "(unauthenticated user)"
-msgstr ""
+msgstr "(utente non autenticato)"
 #: app/models/product.rb:5 app/models/organization.rb:108
 #: app/models/certifier.rb:7 app/views/search/_article_description.html.erb:4
@@ -137,120 +150,129 @@ msgstr &quot;&quot;
 #: app/views/cms/_uploaded_file.html.erb:5
 #: app/views/manage_products/show.html.erb:32
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 #: app/models/product.rb:104 app/helpers/display_helper.rb:42
 #: app/helpers/display_helper.rb:51
 msgid "Uncategorized product"
-msgstr ""
+msgstr "Prodotto senza categoria"
 #: app/models/product.rb:244
 msgid "0%"
-msgstr ""
+msgstr "0%"
 #: app/models/product.rb:245
 msgid "25%"
-msgstr ""
+msgstr "25%"
 #: app/models/product.rb:246
 msgid "50%"
-msgstr ""
+msgstr "50%"
 #: app/models/product.rb:247
 msgid "75%"
-msgstr ""
+msgstr "75%"
 #: app/models/product.rb:248
 msgid "100%"
-msgstr ""
+msgstr "100%"
 #: app/models/invite_member.rb:20
 msgid "Community invitation"
-msgstr ""
+msgstr "Invito della Comunità"
 #: app/models/invite_member.rb:28
 msgid "%{requestor} invited you to join %{linked_subject}."
-msgstr ""
+msgstr "%{requestor} sei stato invitato ad entrare %{linked_subject}."
 #: app/models/invite_member.rb:40
 msgid "%{requestor} invited you to join %{community}."
 msgstr ""
+"%{requestor} sei stato invitato ad entrare nella comunità %{community}.."
 #: app/models/invite_member.rb:45
 msgid "%{requestor} is inviting you to join \"%{community}\" on %{system}."
 msgstr ""
+"%{requestor} sei stato invitato a far parte della comunità \"%{community}\" "
+"nel sistema %{system}."
 #: app/models/invite_member.rb:57 app/models/invite_friend.rb:37
 msgid "Hello <friend>,"
-msgstr ""
+msgstr "Ciao <amico>,"
 #: app/models/invite_member.rb:58
 msgid "<user> is inviting you to join \"<community>\" on <environment>."
 msgstr ""
+"<user> è stato invitato a far parte della comunità \"<community>\" su "
+"<environment>."
 #: app/models/invite_member.rb:59 app/models/invite_friend.rb:39
 msgid "To accept the invitation, please follow this link:"
-msgstr ""
+msgstr "Per accettare questo invito, segui questo link per favore:"
 #: app/models/my_network_block.rb:6 app/models/my_network_block.rb:10
 msgid "My network"
-msgstr ""
+msgstr "La mia Rete"
 #: app/models/my_network_block.rb:14
 msgid "This block displays some info about your networking."
-msgstr ""
+msgstr "Questo blocco mostra alcune informazioni riguardo la tua Rete."
 #: app/models/sellers_search_block.rb:6
 msgid "Search for enterprises and products"
-msgstr ""
+msgstr "Ricerca per  Prodotti e Aziende"
 #: app/models/sellers_search_block.rb:10
 msgid "Products/Enterprises search"
-msgstr ""
+msgstr "Ricerca Prodotti o di Aziende"
 #: app/models/sellers_search_block.rb:14
 msgid "Search for sellers"
-msgstr ""
+msgstr "Ricerca per Venditori"
 #: app/models/sellers_search_block.rb:18
 msgid "This block presents a search engine for products."
-msgstr ""
+msgstr "Questo blocco presenta un motore di ricerca per prodotti."
 #: app/models/categories_block.rb:4
 msgid "Generic category"
-msgstr ""
+msgstr "Categoria Generica"
 #: app/models/categories_block.rb:5 app/helpers/categories_helper.rb:6
 #: app/views/enterprise_registration/basic_information.html.erb:25
 msgid "Region"
-msgstr ""
+msgstr "Regione"
 #: app/models/categories_block.rb:6 app/views/manage_products/index.html.erb:5
 msgid "Product"
-msgstr ""
+msgstr "Prodotto"
 #: app/models/categories_block.rb:14 app/models/categories_block.rb:18
 msgid "Categories Menu"
-msgstr ""
+msgstr "Menu Categorie"
 #: app/models/categories_block.rb:22
 msgid "This block presents the categories like a web site menu."
-msgstr ""
+msgstr "Questo blocco presenta le categorie come un menu di un sito Internet."
 #: app/models/contact_list.rb:18
 msgid ""
 "There was an error while authenticating. Did you enter correct login and "
 "password?"
 msgstr ""
+"C'è stato un errore durante l'autenticazione. Hai utilizzato la giusta Login "
+"e Password?"
 #: app/models/contact_list.rb:25
 msgid ""
 "There was an error while looking for your contact list. Please, try again"
 msgstr ""
+"C'è stato un errore mentre cercavi la tua lista di contatti. Per favore, "
+"prova ancora"
 #: app/models/uploaded_file.rb:12
 msgid "File"
-msgstr ""
+msgstr "File (Documento)"
 #: app/models/uploaded_file.rb:72
 msgid "{fn} of uploaded file was larger than the maximum size of %{size}"
@@ -258,47 +280,47 @@ msgstr &quot;&quot;
 #: app/models/uploaded_file.rb:99
 msgid "Uploaded file"
-msgstr ""
+msgstr "File Caricato"
 #: app/models/uploaded_file.rb:103
 msgid "Upload any kind of file you want."
-msgstr ""
+msgstr "Carica qualunque tipo di File (Documento) che vuoi."
 #: app/models/invite_friend.rb:12
 msgid "Friend invitation"
-msgstr ""
+msgstr "Invito di un Amico"
 #: app/models/invite_friend.rb:16 app/models/invite_friend.rb:28
 #: app/models/add_friend.rb:32 app/models/add_friend.rb:45
 msgid "%{requestor} wants to be your friend."
-msgstr ""
+msgstr "%{requestor} vuole essere tuo amico."
 #: app/models/invite_friend.rb:38
 msgid "<user> is inviting you to participate on <environment>."
-msgstr ""
+msgstr "<user> ti sta invitanto a partecipare a  <environment>."
 #: app/models/fans_block.rb:4
 msgid "Displays the people who like the enterprise"
-msgstr ""
+msgstr "Mostra le persone a cui piace la Società"
 #: app/models/fans_block.rb:8
 msgid "{#} fan"
 msgid_plural "{#} fans"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{#} Ammiratore"
+msgstr[1] "{#} Ammiratori"
 #: app/models/fans_block.rb:12
 msgid "This block presents the fans of an enterprise."
-msgstr ""
+msgstr "Questo blocco presenta gli ammiratori di una Società."
 #: app/models/fans_block.rb:18 app/models/favorite_enterprises_block.rb:19
 #: app/views/cms/_published_media_items.html.erb:7
 msgid "View all"
-msgstr ""
+msgstr "Mostra Tutto"
 #: app/models/slideshow_block.rb:12
 msgid "Slideshow"
-msgstr ""
+msgstr "Presentazione"
 #: app/models/featured_products_block.rb:20
 #: app/views/box_organizer/_featured_products_block.html.erb:1
@@ -13,8 +13,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.0-690-gcb6e853\n"
 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
-"PO-Revision-Date: 2015-03-14 22:06+0200\n"
-"Last-Translator: daniel <dtygel@eita.org.br>\n"
+"PO-Revision-Date: 2015-03-17 21:44+0200\n"
+"Last-Translator: Evandro Junior <evandrojr@gmail.com>\n"
 "Language-Team: Portuguese "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/pt/>\n"
 "Language: pt\n"
@@ -1635,7 +1635,7 @@ msgstr &quot;&quot;
 "não foi aprovada pelo administrador do ambiente. A seguinte explicação foi "
 "dada: \n"
 "\n"
-"%{explication}"
+"%{explanation}"
 #: app/models/create_community.rb:92
 msgid ""
@@ -1946,7 +1946,7 @@ msgstr &quot;&quot;
 "%{environment} NÃO foi aprovada pelo validador de organização. A seguinte "
 "explicação foi dada: \n"
 "\n"
-"%{explication}"
+"%{explanation}"
 #: app/models/create_enterprise.rb:187
 msgid ""
@@ -1128,4 +1128,11 @@ function stop_fetching(element){
   jQuery('.fetching-overlay', element).remove();
 }
+function add_new_file_fields() {
+  var cloned = jQuery('#uploaded_files p:last').clone();
+  cloned.find("input[type='file']").val('');
+  cloned.appendTo('#uploaded_files');
+  jQuery('body').scrollTo(cloned);
+}
+
 window.isHidden = function isHidden() { return (typeof(document.hidden) != 'undefined') ? document.hidden : !document.hasFocus() };
@@ -755,4 +755,12 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     assert_response :forbidden
   end
+  should 'guarantee main block is always visible to everybody' do
+    get :edit, :profile => 'designtestuser', :id => @b4.id
+    %w[logged not_logged followers].each do |option|
+    assert_no_tag :select, :attributes => {:name => 'block[display_user]'},
+     :descendant => {:tag => 'option', :attributes => {:value => option}}
+    end
+  end
+
 end
@@ -77,9 +77,9 @@ class AddFriendTest &lt; ActiveSupport::TestCase
   end
   should 'not add friend twice' do
-    fast_create(AddFriend, :requestor_id => person1.id, :target_id => person2.id)
+    create AddFriend, person: person1, friend: person2, status: 1
     assert_raise ActiveRecord::RecordInvalid do
-      AddFriend.create!(:person => person1, :friend => person2)
+      create AddFriend, person: person1, friend: person2, status: 1
     end
   end
@@ -29,4 +29,8 @@ class MainBlockTest &lt; ActiveSupport::TestCase
     assert !block.visible?
   end
+  should 'guarantee main block is always visible to everybody' do
+    assert_equal MainBlock.new.display_user_options, {"all"=>_('All users')}
+  end
+
 end
@@ -324,7 +324,9 @@ class PersonTest &lt; ActiveSupport::TestCase
   should 'already request friendship' do
     p1 = create_user('testuser1').person
     p2 = create_user('testuser2').person
-    create(AddFriend, :person => p1, :friend => p2)
+    create(AddFriend, person: p1, friend: p2).finish
+    assert !p1.already_request_friendship?(p2)
+    create(AddFriend, person: p1, friend: p2)
     assert p1.already_request_friendship?(p2)
   end
	@@ -9,12 +9,6 @@ module CmsHelper		@@ -9,12 +9,6 @@ module CmsHelper
9	mime_type.gsub('/', '_').gsub('-', '')	9	mime_type.gsub('/', '_').gsub('-', '')
10	end	10	end
11		11
12	- def add_upload_file_field(name, locals)
13	- button_to_function :add, name, nil do \|page\|
14	- page.insert_html :bottom, :uploaded_files, CGI::escapeHTML(render(:partial => 'upload_file', :locals => locals, :object => UploadedFile.new))
15	- end
16	- end
17	-
18	def pagination_links(collection, options={})	12	def pagination_links(collection, options={})
19	options = {:previous_label => '« ', :next_label => ' »', :page_links => false}.merge(options)	13	options = {:previous_label => '« ', :next_label => ' »', :page_links => false}.merge(options)
20	will_paginate(collection, options)	14	will_paginate(collection, options)
	@@ -4,7 +4,7 @@ class AddFriend < Task		@@ -4,7 +4,7 @@ class AddFriend < Task
4		4
5	validates_presence_of :requestor_id, :target_id	5	validates_presence_of :requestor_id, :target_id
6		6
7	- validates_uniqueness_of :target_id, :scope => [ :requestor_id ]	7	+ validates_uniqueness_of :target_id, scope: [ :requestor_id, :status ], if: proc{ \|t\| t.status == Task::Status::ACTIVE }
8		8
9	validates_length_of :group_for_person, :group_for_friend, :maximum => 150, :allow_nil => true	9	validates_length_of :group_for_person, :group_for_friend, :maximum => 150, :allow_nil => true
10		10
	@@ -24,4 +24,10 @@ class MainBlock < Block		@@ -24,4 +24,10 @@ class MainBlock < Block
24	['always', 'except_home_page']	24	['always', 'except_home_page']
25	end	25	end
26		26
		27	+ def display_user_options
		28	+ @display_user_options = {
		29	+ 'all' => _('All users')
		30	+ }
		31	+ end
		32	+
27	end	33	end
	@@ -150,7 +150,7 @@ roles] }		@@ -150,7 +150,7 @@ roles] }
150	end	150	end
151		151
152	def already_request_friendship?(person)	152	def already_request_friendship?(person)
153	- person.tasks.find_by_requestor_id(self.id, :conditions => { :type => 'AddFriend' })	153	+ person.tasks.where(requestor_id: self.id, type: 'AddFriend', status: Task::Status::ACTIVE).first
154	end	154	end
155		155
156	def remove_friend(friend)	156	def remove_friend(friend)
1	<p><%= file_field_tag('uploaded_files[]', :size => size) %></p>	1	<p><%= file_field_tag('uploaded_files[]', :size => size) %></p>
2	-<%= javascript_tag("jQuery('#uploaded_files')[0].scrollTop = jQuery('#uploaded_files')[0].scrollHeight") %>
	@@ -13,7 +13,7 @@		@@ -13,7 +13,7 @@
13	<%= hidden_field_tag('back_to', @back_to) %>	13	<%= hidden_field_tag('back_to', @back_to) %>
14		14
15	<% button_bar do %>	15	<% button_bar do %>
16	- <%= add_upload_file_field(_('More files'), {:size => size}) %>	16	+ <%= button_to_function :add, _('More files'), "add_new_file_fields()" %>
17	<% if @back_to %>	17	<% if @back_to %>
18	<%= submit_button :save, _('Upload'), :cancel => @back_to %>	18	<%= submit_button :save, _('Upload'), :cancel => @back_to %>
19	<% else %>	19	<% else %>
	@@ -5,7 +5,6 @@		@@ -5,7 +5,6 @@
5	<%= yield(:feeds) %>	5	<%= yield(:feeds) %>
6	<!--<meta http-equiv="refresh" content="1"/>-->	6	<!--<meta http-equiv="refresh" content="1"/>-->
7	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>	7	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
8	- <meta name="description" content="<%= @environment.name %>" />
9		8
10	<!-- site root -->	9	<!-- site root -->
11	<meta property="noosfero:root" content="<%= Noosfero.root %>"/>	10	<meta property="noosfero:root" content="<%= Noosfero.root %>"/>
	@@ -40,6 +40,19 @@ class CustomFormsPluginProfileControllerTest < ActionController::TestCase		@@ -40,6 +40,19 @@ class CustomFormsPluginProfileControllerTest < ActionController::TestCase
40	assert_redirected_to :action => 'show'	40	assert_redirected_to :action => 'show'
41	end	41	end
42		42
		43	+ should 'display errors if user is not logged in and author_name is not uniq' do
		44	+ logout
		45	+ form = CustomFormsPlugin::Form.create(:profile => profile, :name => 'Free Software')
		46	+ field = CustomFormsPlugin::TextField.create(:name => 'Name', :form => form)
		47	+ submission = CustomFormsPlugin::Submission.create(:form => form, :author_name => "john", :author_email => 'john@example.com')
		48	+
		49	+ assert_no_difference 'CustomFormsPlugin::Submission.count' do
		50	+ post :show, :profile => profile.identifier, :id => form.id, :author_name => "john", :author_email => 'john@example.com', :submission => {field.id.to_s => 'Noosfero'}
		51	+ end
		52	+ assert_equal "Submission could not be saved", session[:notice]
		53	+ assert_tag :tag => 'div', :attributes => { :class => 'errorExplanation', :id => 'errorExplanation' }
		54	+ end
		55	+
43	should 'disable fields if form expired' do	56	should 'disable fields if form expired' do
44	form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :begining => Time.now + 1.day)	57	form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :begining => Time.now + 1.day)
45	form.fields << CustomFormsPlugin::TextField.create(:name => 'Field Name', :form => form, :default_value => "First Field")	58	form.fields << CustomFormsPlugin::TextField.create(:name => 'Field Name', :form => form, :default_value => "First Field")
	@@ -2942,10 +2942,6 @@ msgstr "Karte"		@@ -2942,10 +2942,6 @@ msgstr "Karte"
2942	msgid "Full"	2942	msgid "Full"
2943	msgstr "Vollständig"	2943	msgstr "Vollständig"
2944		2944
2945	-#: app/helpers/search_helper.rb:104
2946	-msgid "Display"
2947	-msgstr "Anzeige"
2948	-
2949	#: app/helpers/search_helper.rb:118 app/helpers/users_helper.rb:16	2945	#: app/helpers/search_helper.rb:118 app/helpers/users_helper.rb:16
2950	#: app/views/tasks/index.html.erb:26 app/views/tasks/index.html.erb:41	2946	#: app/views/tasks/index.html.erb:26 app/views/tasks/index.html.erb:41
2951	#: app/views/memberships/index.html.erb:16	2947	#: app/views/memberships/index.html.erb:16
	@@ -3000,19 +2996,6 @@ msgstr "Aktivere Unternehmen aus dem Netzwerk"		@@ -3000,19 +2996,6 @@ msgstr "Aktivere Unternehmen aus dem Netzwerk"
3000	msgid "More popular enterprises from network"	2996	msgid "More popular enterprises from network"
3001	msgstr "Beliebtere Unternehmen aus dem Netzwerk"	2997	msgstr "Beliebtere Unternehmen aus dem Netzwerk"
3002		2998
3003	-#: app/helpers/search_helper.rb:23 app/helpers/search_helper.rb:113
3004	-#, fuzzy
3005	-msgid "Compact"
3006	-msgstr "Berechnung"
3007	-
3008	-#: app/helpers/search_helper.rb:55
3009	-msgid ", "
3010	-msgstr ", "
3011	-
3012	-#: app/helpers/search_helper.rb:56
3013	-msgid "search in all categories"
3014	-msgstr "In allen Kategorien suchen"
3015	-
3016	#: app/helpers/boxes_helper.rb:106	2999	#: app/helpers/boxes_helper.rb:106
3017	msgid "This block is invisible. Your visitors will not see it."	3000	msgid "This block is invisible. Your visitors will not see it."
3018	msgstr "Dieser Bereich ist nicht sichtbar. Ihre Kunden werden ihn nicht sehen."	3001	msgstr "Dieser Bereich ist nicht sichtbar. Ihre Kunden werden ihn nicht sehen."
	@@ -3389,11 +3372,6 @@ msgstr "Aktiviert um"		@@ -3389,11 +3372,6 @@ msgstr "Aktiviert um"
3389	msgid "Deativated users"	3372	msgid "Deativated users"
3390	msgstr "Nutzer verwalten"	3373	msgstr "Nutzer verwalten"
3391		3374
3392	-#: app/helpers/users_helper.rb:16 app/views/tasks/index.html.erb:26
3393	-#: app/views/tasks/index.html.erb:41 app/views/memberships/index.html.erb:16
3394	-msgid "Filter"
3395	-msgstr "Filter"
3396	-
3397	#: app/helpers/forms_helper.rb:62	3375	#: app/helpers/forms_helper.rb:62
3398	msgid "Select the State"	3376	msgid "Select the State"
3399	msgstr "Wählen Sie das Bundesland"	3377	msgstr "Wählen Sie das Bundesland"
	@@ -9909,45 +9887,6 @@ msgstr ""		@@ -9909,45 +9887,6 @@ msgstr ""
9909	"\">GNU Affero General Public License</a> Version 3 oder einer späteren "	9887	"\">GNU Affero General Public License</a> Version 3 oder einer späteren "
9910	"Version lizenziert ist."	9888	"Version lizenziert ist."
9911		9889
9912	-#~ msgid "More recent contents from network"
9913	-#~ msgstr "Neueste Inhalte aus dem Netzwerk"
9914	-
9915	-#~ msgid "More viewed contents from network"
9916	-#~ msgstr "Meistgesehene Inhalte aus dem Netzwerk"
9917	-
9918	-#~ msgid "Most commented contents from network"
9919	-#~ msgstr "Meistkommentierte Inhalte aus dem Netzwerk"
9920	-
9921	-#~ msgid "More recent people from network"
9922	-#~ msgstr "Neuere Leute aus dem Netzwerk"
9923	-
9924	-#~ msgid "More active people from network"
9925	-#~ msgstr "Aktivere Leute aus dem Netzwerk"
9926	-
9927	-#~ msgid "More popular people from network"
9928	-#~ msgstr "Populärere Leute aus dem Netzwerk"
9929	-
9930	-#~ msgid "More recent communities from network"
9931	-#~ msgstr "Neuere Gemeinschaften aus dem Netzwerk"
9932	-
9933	-#~ msgid "More active communities from network"
9934	-#~ msgstr "Aktivere Gemeinschaften aus dem Netzwerk"
9935	-
9936	-#~ msgid "More popular communities from network"
9937	-#~ msgstr "Populärere Gemeinschaften aus dem Netzwerk"
9938	-
9939	-#, fuzzy
9940	-#~ msgid "More recent enterprises from network"
9941	-#~ msgstr "Neueste Inhalte aus dem Netzwerk"
9942	-
9943	-#, fuzzy
9944	-#~ msgid "More active enterprises from network"
9945	-#~ msgstr "Aktivere Leute aus dem Netzwerk"
9946	-
9947	-#, fuzzy
9948	-#~ msgid "More popular enterprises from network"
9949	-#~ msgstr "Populärere Leute aus dem Netzwerk"
9950	-
9951	#~ msgid "starting chat with %{name}"	9890	#~ msgid "starting chat with %{name}"
9952	#~ msgstr "starte Chat mit %{name}"	9891	#~ msgstr "starte Chat mit %{name}"
9953		9892
	@@ -1128,4 +1128,11 @@ function stop_fetching(element){		@@ -1128,4 +1128,11 @@ function stop_fetching(element){
1128	jQuery('.fetching-overlay', element).remove();	1128	jQuery('.fetching-overlay', element).remove();
1129	}	1129	}
1130		1130
		1131	+function add_new_file_fields() {
		1132	+ var cloned = jQuery('#uploaded_files p:last').clone();
		1133	+ cloned.find("input[type='file']").val('');
		1134	+ cloned.appendTo('#uploaded_files');
		1135	+ jQuery('body').scrollTo(cloned);
		1136	+}
		1137	+
1131	window.isHidden = function isHidden() { return (typeof(document.hidden) != 'undefined') ? document.hidden : !document.hasFocus() };	1138	window.isHidden = function isHidden() { return (typeof(document.hidden) != 'undefined') ? document.hidden : !document.hasFocus() };