Download as
Browse Code »

Commit 3c46f30a36e70a2ff09e7ea691daca47e0f883ec

Authored by Braulio Bhavamitra
1 parent fd398cc0
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

access_control: Rename file (fix tests)

Showing 2 changed files with 10 additions and 10 deletions   Show diff stats
test/unit/manage_products_helper_test.rb
  Diff comments   View file @3c46f30
... ... @@ -101,7 +101,7 @@ class ManageProductsHelperTest < ActionView::TestCase
101 101 category = fast_create(ProductCategory, :name => 'Category 1', :environment_id => @environment.id)
102 102 product = fast_create(Product, :product_category_id => category.id)
103 103  
104   - expects(:ui_button_to_remote).with('link to edit', {:update => "product-info", :loading => "loading_for_button('#edit-product-remote-button-ui-info')", :url => {:controller => 'manage_products', :action => 'edit', :id => product.id, :field => 'info'}, :complete => "$('edit-product-button-ui-info').hide()", :method => :get}, :id => 'edit-product-remote-button-ui-info').returns('LINK')
  104 + expects(:ui_button_to_remote).with('link to edit', {:update => "product-info", :loading => "loading_for_button('#edit-product-remote-button-ui-info')", :url => {:controller => 'manage_products', :action => 'edit', :id => product.id, :field => 'info'}, :complete => "$('#edit-product-button-ui-info').hide()", :method => :get}, :id => 'edit-product-remote-button-ui-info').returns('LINK')
105 105  
106 106 assert_equal 'LINK', edit_product_ui_button_to_remote(product, 'info', 'link to edit')
107 107 end
... ...
vendor/plugins/access_control/lib/permission_check.rb
  Diff comments   View file @3c46f30
1 1 module PermissionCheck
2   -
  2 +
3 3 module ClassMethods
4 4 # Declares the +permission+ need to be able to access +action+.
5 5 #
... ... @@ -8,15 +8,15 @@ module PermissionCheck
8 8 # * +target+ is the object over witch the user would need the specified
9 9 # permission and must be specified as a symbol or the string 'global'. The controller using
10 10 # +target+ must respond to a method with that name returning the object
11   - # against which the permissions needed will be checked or if 'global' is passed it will be
  11 + # against which the permissions needed will be checked or if 'global' is passed it will be
12 12 # cheked if the assignment is global
13 13 # * +accessor+ is a mehtod that returns the accessor who must have the permission. By default
14 14 # is :user
15   - # * +action+ must be a hash of options for a before filter like
  15 + # * +action+ must be a hash of options for a before filter like
16 16 # :only => :index or :except => [:edit, :update] by default protects all the actions
17 17 def protect(permission, target_method, accessor_method = :user, actions = {})
18 18 actions, accessor_method = accessor_method, :user if accessor_method.kind_of?(Hash)
19   - before_filter actions do |c|
  19 + before_filter actions do |c|
20 20 target = target_method.kind_of?(Symbol) ? c.send(target_method) : target_method
21 21 accessor = accessor_method.kind_of?(Symbol) ? c.send(accessor_method) : accessor_method
22 22 unless accessor && accessor.has_permission?(permission.to_s, target)
... ... @@ -34,12 +34,12 @@ module PermissionCheck
34 34 end
35 35  
36 36 def access_denied_template_path
37   - if File.exists?(File.join(Rails.root, 'app', 'views', 'access_control', 'access_denied.rhtml'))
38   - File.join(Rails.root, 'app', 'views', 'access_control', 'access_denied.rhtml')
39   - elsif File.exists?(File.join(Rails.root, 'app','views', 'shared', 'access_denied.rhtml'))
40   - File.join('shared', 'access_denied.rhtml')
  37 + if File.exists?(File.join(Rails.root, 'app', 'views', 'access_control', 'access_denied.html.erb'))
  38 + File.join(Rails.root, 'app', 'views', 'access_control', 'access_denied.html.erb')
  39 + elsif File.exists?(File.join(Rails.root, 'app','views', 'shared', 'access_denied.html.erb'))
  40 + File.join('shared', 'access_denied.html.erb')
41 41 else
42   - File.join(File.dirname(__FILE__), '..', 'views', 'access_denied.rhtml')
  42 + File.join(File.dirname(__FILE__), '..', 'views', 'access_denied.html.erb')
43 43 end
44 44 end
45 45 end
... ...