Download as
Browse Code »

Commit 180b53df9877223128574f6da00ebf65c9093f80

Authored by Evandro Jr
2 parents 6460aa28 77ee15d0
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

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

Showing 7 changed files with 8 additions and 17 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @180b53d
... ... @@ -1321,7 +1321,9 @@ module ApplicationHelper
1321 1321 end
1322 1322 else
1323 1323 options = options_for_select(templates.collect{ |template| [template.name, template.id]})
1324   - content_tag('div', content_tag('label', _('Profile organization'), :class => 'formlabel') + (select_tag 'profile_data[template_id]', options, :onchange => 'show_fields_for_template(this);'))
  1324 + content_tag('div',
  1325 + content_tag('div', content_tag('label', _('Profile organization'), :class => 'formlabel') + (select_tag 'profile_data[template_id]', options, :onchange => 'show_fields_for_template(this);')),
  1326 + :id => 'template-options')
1325 1327 end
1326 1328 end
1327 1329  
... ...
app/models/comment.rb
  Diff comments   View file @180b53d
... ... @@ -46,7 +46,7 @@ class Comment < ActiveRecord::Base
46 46  
47 47 acts_as_having_settings :field => :setting
48 48  
49   - xss_terminate :only => [ :body, :title, :name ], :with => 'white_list', :on => 'validation'
  49 + xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
50 50  
51 51 def comment_root
52 52 (reply_of && reply_of.comment_root) || self
... ...
app/views/cms/why_categorize.html.erb
  Diff comments   View file @180b53d
... ... @@ -5,5 +5,5 @@
5 5 </p>
6 6  
7 7 <% button_bar do %>
8   - <%= colorbox_close_button _('Close') %>
  8 + <%= lightbox_close_button _('Close') %>
9 9 <% end %>
... ...
app/views/shared/logged_in/xmpp_chat.html.erb
  Diff comments   View file @180b53d
... ... @@ -87,7 +87,7 @@
87 87 <li class='%{presence_status}'>
88 88 <a data-id='%{jid_id}' class='icon-menu-%{presence_status}-11' href='#'>
89 89 %{avatar}
90   - <span class="name">%{name}<span>
  90 + <span class="name">%{name}</span>
91 91 </a>
92 92 </li>
93 93 </div>
... ...
lib/api/entities.rb
  Diff comments   View file @180b53d
... ... @@ -2,7 +2,7 @@ module API
2 2 module Entities
3 3  
4 4 Grape::Entity.format_with :timestamp do |date|
5   - date.strftime('%Y/%m/%d %H:%M:%S')
  5 + date.strftime('%Y/%m/%d %H:%M:%S') if date
6 6 end
7 7  
8 8 class Image < Grape::Entity
... ...
test/functional/manage_products_controller_test.rb
  Diff comments   View file @180b53d
... ... @@ -150,7 +150,7 @@ class ManageProductsControllerTest &lt; ActionController::TestCase
150 150 category2 = fast_create(ProductCategory, :name => 'Category 2', :parent_id => category1.id)
151 151 category3 = fast_create(ProductCategory, :name => 'Category 3', :parent_id => category2.id)
152 152 get :new, :profile => @enterprise.identifier
153   - assert_tag :tag => 'select', :attributes => { :id => 'category_id' }, :descendant => { :tag => 'option', :content => category1.name }
  153 + assert_tag :tag => 'select', :attributes => { :id => 'category_id' }, :descendant => { :tag => 'option', :content => category1.name + " &raquo;" }
154 154 end
155 155  
156 156 should "create new product categorized" do
... ...
test/unit/person_notifier_test.rb
  Diff comments   View file @180b53d
... ... @@ -214,17 +214,6 @@ class PersonNotifierTest &lt; ActiveSupport::TestCase
214 214 assert_equal 1, Delayed::Job.count
215 215 end
216 216  
217   - should 'NotifyJob failed jobs create a new NotifyJob on failure' do
218   - Delayed::Worker.max_attempts = 1
219   - Delayed::Job.enqueue(PersonNotifier::NotifyJob.new(@member.id))
220   -
221   - PersonNotifier.any_instance.stubs(:notify).raises('error')
222   -
223   - process_delayed_job_queue
224   - jobs = PersonNotifier::NotifyJob.find(@member.id)
225   - assert !jobs.select {|j| !j.failed? && j.last_error.nil? }.empty?
226   - end
227   -
228 217 private
229 218  
230 219 def notify
... ...