Download as
Browse Code »

Commit aad3f711d0fa63059312a005dfac490477233248

Authored by Antonio Terceiro
2 parents 4d61f841 3bb862fb
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Merge branch 'stable' 

Conflicts:
	po/pt_BR/noosfero.po
Showing 18 changed files with 109 additions and 20 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @aad3f71
@@ -37,12 +37,6 @@ class ApplicationController < ActionController::Base @@ -37,12 +37,6 @@ class ApplicationController < ActionController::Base
37 def uses_design_blocks? 37 def uses_design_blocks?
38 !@no_design_blocks && self.class.uses_design_blocks? 38 !@no_design_blocks && self.class.uses_design_blocks?
39 end 39 end
40 - module UsesDesignBlocksHelper  
41 - def uses_design_blocks?  
42 - @controller.uses_design_blocks?  
43 - end  
44 - end  
45 - helper UsesDesignBlocksHelper  
46 40
47 # Be sure to include AuthenticationSystem in Application Controller instead 41 # Be sure to include AuthenticationSystem in Application Controller instead
48 include AuthenticatedSystem 42 include AuthenticatedSystem
@@ -67,6 +61,7 @@ class ApplicationController < ActionController::Base @@ -67,6 +61,7 @@ class ApplicationController < ActionController::Base
67 def avoid_ssl 61 def avoid_ssl
68 return true if (!request.ssl? || ENV['RAILS_ENV'] == 'development') 62 return true if (!request.ssl? || ENV['RAILS_ENV'] == 'development')
69 redirect_to(params.merge(:protocol => 'http://')) 63 redirect_to(params.merge(:protocol => 'http://'))
  64 + false
70 end 65 end
71 66
72 before_init_gettext :maybe_save_locale 67 before_init_gettext :maybe_save_locale
app/controllers/box_organizer_controller.rb
  Diff comments   View file @aad3f71
1 class BoxOrganizerController < ApplicationController 1 class BoxOrganizerController < ApplicationController
2 2
  3 + before_filter :login_required
  4 +
3 def index 5 def index
4 end 6 end
5 7
app/helpers/boxes_helper.rb
  Diff comments   View file @aad3f71
1 module BoxesHelper 1 module BoxesHelper
2 2
3 def insert_boxes(content) 3 def insert_boxes(content)
4 - if @controller.send(:boxes_editor?) 4 + if @controller.send(:boxes_editor?) && @controller.send(:uses_design_blocks?)
5 content + display_boxes_editor(@controller.boxes_holder) 5 content + display_boxes_editor(@controller.boxes_holder)
6 else 6 else
7 if @controller.send(:uses_design_blocks?) 7 if @controller.send(:uses_design_blocks?)
app/models/invite_friend.rb
  Diff comments   View file @aad3f71
@@ -22,6 +22,14 @@ class InviteFriend &lt; Task @@ -22,6 +22,14 @@ class InviteFriend &lt; Task
22 TaskMailer.deliver_invitation_notification(task) unless task.friend 22 TaskMailer.deliver_invitation_notification(task) unless task.friend
23 end 23 end
24 24
  25 + def validate
  26 + super
  27 + friendemail = friend ? friend.user.email : friend_email
  28 + if person && friendemail && person.user.email == friendemail
  29 + self.errors.add_to_base(_("You can't invite youself"))
  30 + end
  31 + end
  32 +
25 def perform 33 def perform
26 requestor.add_friend(target, group_for_person) 34 requestor.add_friend(target, group_for_person)
27 target.add_friend(requestor, group_for_friend) 35 target.add_friend(requestor, group_for_friend)
app/models/person.rb
  Diff comments   View file @aad3f71
@@ -142,6 +142,8 @@ class Person &lt; Profile @@ -142,6 +142,8 @@ class Person &lt; Profile
142 validates_presence_of :user_id 142 validates_presence_of :user_id
143 validates_uniqueness_of :user_id 143 validates_uniqueness_of :user_id
144 144
  145 + validates_associated :user
  146 +
145 def email 147 def email
146 self.user.nil? ? nil : self.user.email 148 self.user.nil? ? nil : self.user.email
147 end 149 end
app/models/profile.rb
  Diff comments   View file @aad3f71
@@ -231,7 +231,7 @@ class Profile &lt; ActiveRecord::Base @@ -231,7 +231,7 @@ class Profile &lt; ActiveRecord::Base
231 # instances. 231 # instances.
232 def create_default_set_of_boxes 232 def create_default_set_of_boxes
233 if template 233 if template
234 - copy_blocks_from template 234 + apply_template(template, :copy_articles => false)
235 else 235 else
236 3.times do 236 3.times do
237 self.boxes << Box.new 237 self.boxes << Box.new
@@ -264,9 +264,9 @@ class Profile &lt; ActiveRecord::Base @@ -264,9 +264,9 @@ class Profile &lt; ActiveRecord::Base
264 nil 264 nil
265 end 265 end
266 266
267 - def apply_template(template) 267 + def apply_template(template, options = {:copy_articles => true})
268 copy_blocks_from(template) 268 copy_blocks_from(template)
269 - copy_articles_from(template) 269 + copy_articles_from(template) if options[:copy_articles]
270 270
271 # copy interesting attributes 271 # copy interesting attributes
272 self.layout_template = template.layout_template 272 self.layout_template = template.layout_template
lib/noosfero.rb
  Diff comments   View file @aad3f71
@@ -18,7 +18,7 @@ module Noosfero @@ -18,7 +18,7 @@ module Noosfero
18 end 18 end
19 19
20 def self.identifier_format 20 def self.identifier_format
21 - '[a-z][a-z0-9~.]*([_-][a-z0-9~.]+)*' 21 + '[a-z0-9][a-z0-9~.]*([_-][a-z0-9~.]+)*'
22 end 22 end
23 23
24 private 24 private
po/pt_BR/noosfero.po
  Diff comments   View file @aad3f71
@@ -13,7 +13,7 @@ msgid &quot;&quot; @@ -13,7 +13,7 @@ msgid &quot;&quot;
13 msgstr "" 13 msgstr ""
14 "Project-Id-Version: noosfero 0.18.4\n" 14 "Project-Id-Version: noosfero 0.18.4\n"
15 "POT-Creation-Date: 2009-07-17 17:55-0300\n" 15 "POT-Creation-Date: 2009-07-17 17:55-0300\n"
16 -"PO-Revision-Date: 2009-07-17 18:47-0300\n" 16 +"PO-Revision-Date: 2009-07-20 14:22-0300\n"
17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n" 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18 "Language-Team: LANGUAGE <LL@li.org>\n" 18 "Language-Team: LANGUAGE <LL@li.org>\n"
19 "MIME-Version: 1.0\n" 19 "MIME-Version: 1.0\n"
@@ -2383,6 +2383,10 @@ msgstr &quot;Uma busca de empreendimentos por produtos vendidos e localização&quot; @@ -2383,6 +2383,10 @@ msgstr &quot;Uma busca de empreendimentos por produtos vendidos e localização&quot;
2383 msgid "Sellers search block" 2383 msgid "Sellers search block"
2384 msgstr "Bloco de busca por vendedores" 2384 msgstr "Bloco de busca por vendedores"
2385 2385
  2386 +#: app/models/environment.rb:299
  2387 +msgid "<user> is inviting you to participate on %{environment}."
  2388 +msgstr "<user> está te convidando a participar do %{environment}"
  2389 +
2386 #: app/models/sellers_search_block.rb:12 2390 #: app/models/sellers_search_block.rb:12
2387 msgid "Search for sellers" 2391 msgid "Search for sellers"
2388 msgstr "Buscar por vendedores:" 2392 msgstr "Buscar por vendedores:"
test/functional/application_controller_test.rb
  Diff comments   View file @aad3f71
@@ -412,4 +412,15 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase @@ -412,4 +412,15 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
412 assert_no_tag :tag => 'div', :attributes => {:id => 'block-' + b.id.to_s} 412 assert_no_tag :tag => 'div', :attributes => {:id => 'block-' + b.id.to_s}
413 end 413 end
414 414
  415 + should 'return false when not avoid ssl' do
  416 + req = mock
  417 + req.stubs(:ssl?).returns(true)
  418 +
  419 + @controller.expects(:request).returns(req)
  420 + @controller.stubs(:params).returns({})
  421 + @controller.stubs(:redirect_to)
  422 +
  423 + assert_equal false, @controller.avoid_ssl
  424 + end
  425 +
415 end 426 end
test/functional/friends_controller_test.rb
  Diff comments   View file @aad3f71
@@ -151,4 +151,10 @@ class FriendsControllerTest &lt; Test::Unit::TestCase @@ -151,4 +151,10 @@ class FriendsControllerTest &lt; Test::Unit::TestCase
151 end 151 end
152 end 152 end
153 153
  154 + should 'not invite yourself' do
  155 + assert_no_difference InviteFriend, :count do
  156 + post :invite, :manual_import_addresses => "#{profile.name} <#{profile.user.email}>", :import_from => "manual", :message => "click: <url>", :confirmation => 1, :wizard => true
  157 + end
  158 + end
  159 +
154 end 160 end
test/functional/profile_design_controller_test.rb
  Diff comments   View file @aad3f71
@@ -12,7 +12,7 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase @@ -12,7 +12,7 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase
12 @request.stubs(:ssl?).returns(true) 12 @request.stubs(:ssl?).returns(true)
13 @response = ActionController::TestResponse.new 13 @response = ActionController::TestResponse.new
14 14
15 - @holder = create_user('designtestuser').person 15 + @profile = @holder = create_user('designtestuser').person
16 holder.save! 16 holder.save!
17 17
18 @box1 = Box.new 18 @box1 = Box.new
@@ -65,6 +65,7 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase @@ -65,6 +65,7 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase
65 @controller.stubs(:boxes_holder).returns(holder) 65 @controller.stubs(:boxes_holder).returns(holder)
66 login_as 'designtestuser' 66 login_as 'designtestuser'
67 end 67 end
  68 + attr_reader :profile
68 69
69 def test_local_files_reference 70 def test_local_files_reference
70 assert_local_files_reference :get, :index, :profile => 'designtestuser' 71 assert_local_files_reference :get, :index, :profile => 'designtestuser'
@@ -319,4 +320,17 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase @@ -319,4 +320,17 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase
319 assert_equal 20, @box1.blocks[-1].limit 320 assert_equal 20, @box1.blocks[-1].limit
320 end 321 end
321 322
  323 + should 'require login' do
  324 + logout
  325 + get :index, :profile => profile.identifier
  326 + assert_redirected_to :controller => 'account', :action => 'login'
  327 + end
  328 +
  329 + should 'not show sideboxes when render access denied' do
  330 + another_profile = create_user('bobmarley').person
  331 + get :index, :profile => another_profile.identifier
  332 + assert_tag :tag => 'div', :attributes => {:class => 'no-boxes'}
  333 + assert_tag :tag => 'div', :attributes => {:id => 'access-denied'}
  334 + end
  335 +
322 end 336 end
test/unit/invite_friend_test.rb
  Diff comments   View file @aad3f71
@@ -137,4 +137,14 @@ class InviteFriendTest &lt; ActiveSupport::TestCase @@ -137,4 +137,14 @@ class InviteFriendTest &lt; ActiveSupport::TestCase
137 assert_equal :manage_friends, t.permission 137 assert_equal :manage_friends, t.permission
138 end 138 end
139 139
  140 + should 'not invite yourself' do
  141 + p = create_user('testuser1').person
  142 +
  143 + task1 = InviteFriend.new(:person => p, :friend => p, :message => 'click here: <url>')
  144 + assert !task1.save
  145 +
  146 + task2 = InviteFriend.new(:person => p, :friend_name => 'Myself', :friend_email => p.user.email, :message => 'click here: <url>')
  147 + assert !task2.save
  148 + end
  149 +
140 end 150 end
test/unit/noosfero_test.rb
  Diff comments   View file @aad3f71
@@ -26,7 +26,6 @@ class NoosferoTest &lt; Test::Unit::TestCase @@ -26,7 +26,6 @@ class NoosferoTest &lt; Test::Unit::TestCase
26 should 'identifier format' do 26 should 'identifier format' do
27 assert_match /^#{Noosfero.identifier_format}$/, 'bli-bla' 27 assert_match /^#{Noosfero.identifier_format}$/, 'bli-bla'
28 assert_no_match /^#{Noosfero.identifier_format}$/, 'UPPER' 28 assert_no_match /^#{Noosfero.identifier_format}$/, 'UPPER'
29 - assert_no_match /^#{Noosfero.identifier_format}$/, '129812startingwithnumber'  
30 assert_match /^#{Noosfero.identifier_format}$/, 'with~tilde' 29 assert_match /^#{Noosfero.identifier_format}$/, 'with~tilde'
31 assert_match /^#{Noosfero.identifier_format}$/, 'with.dot' 30 assert_match /^#{Noosfero.identifier_format}$/, 'with.dot'
32 end 31 end
@@ -46,4 +45,8 @@ class NoosferoTest &lt; Test::Unit::TestCase @@ -46,4 +45,8 @@ class NoosferoTest &lt; Test::Unit::TestCase
46 assert_equal({:port => 9999}, Noosfero.url_options) 45 assert_equal({:port => 9999}, Noosfero.url_options)
47 end 46 end
48 47
  48 + should 'allow identifier starting with number' do
  49 + assert_match /^#{Noosfero.identifier_format}$/, '129812startingwithnumber'
  50 + end
  51 +
49 end 52 end
test/unit/person_test.rb
  Diff comments   View file @aad3f71
@@ -565,4 +565,13 @@ class PersonTest &lt; Test::Unit::TestCase @@ -565,4 +565,13 @@ class PersonTest &lt; Test::Unit::TestCase
565 assert !Profile['testuser1'].add_friend(p2) 565 assert !Profile['testuser1'].add_friend(p2)
566 end 566 end
567 567
  568 + should 'not raise exception when validates person without e-mail' do
  569 + person = create_user('testuser1').person
  570 + person.user.email = nil
  571 +
  572 + assert_nothing_raised ActiveRecord::RecordInvalid do
  573 + assert !person.save
  574 + end
  575 + end
  576 +
568 end 577 end
test/unit/profile_test.rb
  Diff comments   View file @aad3f71
@@ -1359,6 +1359,17 @@ class ProfileTest &lt; Test::Unit::TestCase @@ -1359,6 +1359,17 @@ class ProfileTest &lt; Test::Unit::TestCase
1359 assert !profile.valid? 1359 assert !profile.valid?
1360 end 1360 end
1361 1361
  1362 + should 'copy header and footer after create a person' do
  1363 + template = create_user('template').person
  1364 + template.custom_footer = "footer customized"
  1365 + template.custom_header = "header customized"
  1366 + Environment.any_instance.stubs(:person_template).returns(template)
  1367 +
  1368 + person = create_user('mytestuser').person
  1369 + assert_equal "footer customized", person.custom_footer
  1370 + assert_equal "header customized", person.custom_header
  1371 + end
  1372 +
1362 private 1373 private
1363 1374
1364 def assert_invalid_identifier(id) 1375 def assert_invalid_identifier(id)
vendor/plugins/access_control/lib/permission_check.rb
  Diff comments   View file @aad3f71
@@ -20,12 +20,19 @@ module PermissionCheck @@ -20,12 +20,19 @@ module PermissionCheck
20 target = target_method.kind_of?(Symbol) ? c.send(target_method) : target_method 20 target = target_method.kind_of?(Symbol) ? c.send(target_method) : target_method
21 accessor = accessor_method.kind_of?(Symbol) ? c.send(accessor_method) : accessor_method 21 accessor = accessor_method.kind_of?(Symbol) ? c.send(accessor_method) : accessor_method
22 unless accessor && accessor.has_permission?(permission.to_s, target) 22 unless accessor && accessor.has_permission?(permission.to_s, target)
23 -# c.instance_variable_set('@b', [accessor, permission, target])  
24 - c.send(:render, :template => access_denied_template_path, :status => 403) && false 23 + render_access_denied(c) && false
25 end 24 end
26 end 25 end
27 end 26 end
28 27
  28 + def render_access_denied(c)
  29 + if c.respond_to?(:render_access_denied)
  30 + c.send(:render_access_denied)
  31 + else
  32 + c.send(:render, :template => access_denied_template_path, :status => 403)
  33 + end
  34 + end
  35 +
29 def access_denied_template_path 36 def access_denied_template_path
30 if File.exists?(File.join(RAILS_ROOT, 'app', 'views', 'access_control', 'access_denied.rhtml')) 37 if File.exists?(File.join(RAILS_ROOT, 'app', 'views', 'access_control', 'access_denied.rhtml'))
31 File.join(RAILS_ROOT, 'app', 'views', 'access_control', 'access_denied.rhtml') 38 File.join(RAILS_ROOT, 'app', 'views', 'access_control', 'access_denied.rhtml')
vendor/plugins/access_control/test/schema.rb
  Diff comments   View file @aad3f71
@@ -3,10 +3,11 @@ ActiveRecord::Migration.verbose = false @@ -3,10 +3,11 @@ ActiveRecord::Migration.verbose = false
3 ActiveRecord::Schema.define(:version => 0) do 3 ActiveRecord::Schema.define(:version => 0) do
4 4
5 create_table :access_control_test_roles, :force => true do |t| 5 create_table :access_control_test_roles, :force => true do |t|
6 - t.column :name, :string  
7 - t.column :permissions, :string  
8 - t.column :key, :string  
9 - t.column :system, :boolean, :default => false 6 + t.column :name, :string
  7 + t.column :permissions, :string
  8 + t.column :key, :string
  9 + t.column :system, :boolean, :default => false
  10 + t.column :environment_id, :integer
10 end 11 end
11 12
12 create_table :access_control_test_role_assignments, :force => true do |t| 13 create_table :access_control_test_role_assignments, :force => true do |t|
vendor/plugins/access_control/test/test_helper.rb
  Diff comments   View file @aad3f71
@@ -18,6 +18,12 @@ RoleAssignment.set_table_name &#39;access_control_test_role_assignments&#39; @@ -18,6 +18,12 @@ RoleAssignment.set_table_name &#39;access_control_test_role_assignments&#39;
18 class AccessControlTestAccessor < ActiveRecord::Base 18 class AccessControlTestAccessor < ActiveRecord::Base
19 set_table_name 'access_control_test_accessors' 19 set_table_name 'access_control_test_accessors'
20 acts_as_accessor 20 acts_as_accessor
  21 + def cache_keys
  22 + []
  23 + end
  24 + def blocks_to_expire_cache
  25 + []
  26 + end
21 end 27 end
22 28
23 # resource example class to be accessed by some accessor 29 # resource example class to be accessed by some accessor