Commit Graph

20 Commits

Author SHA1 Message Date
Neal Chambers
1e4034534c Fix Layout/LineLength 2023-06-23 09:08:04 +09:00
Cillian O'Ruanaidh
e1478e3ae8 Eager load the EnterpriseRelationship :permissions association on the enterprise permissions page
For #8028
2021-08-27 12:01:25 +01:00
Luis Ramos
e52937c113 Use rubocop auto correct to add frozen string literal to all files
This is an unsafe auto corection, we will need to trust our build here
2021-06-17 23:07:26 +01:00
Luis Ramos
23627c5453 Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied
9290 issues fixed
2021-06-17 22:19:26 +01:00
Luis Ramos
cb8fd2131e Use body: nil instead of deprecated nothing:
Ideally we would be using render head status but it's issuing quite a lot of double render problems, we can improve later
2021-03-16 23:13:58 +00:00
Luis Ramos
53d758ca21 Replace render text with render plain for rails 5.1 2021-03-16 23:13:58 +00:00
Luis Ramos
0fb9f44dda Make all controllers use new Admin::ResourceController 2020-12-03 15:32:20 -08:00
Luis Ramos
be4104d6f3 Merge branch 'master' into 3-0-stable-may-5 2020-05-05 19:11:20 +01:00
Matt-Yorkley
9682544442 Eager-load and update BasicEnterpriseSerializer 2020-04-28 20:10:40 +02:00
Luis Ramos
3ccd58d50b Fix a problem in the permit list to allow a list to be taken 2020-03-21 20:30:34 +00:00
Matt-Yorkley
fccc8037f0 Add strong_params to enterprise_relationships_controller.rb
Fixes specs such as:

  31)
  As an Administrator
  I want to manage relationships between enterprises
 as a site administrator creating a relationship
      Failure/Error: raise ActiveModel::ForbiddenAttributesError, params.to_s

      ActiveModel::ForbiddenAttributesError:
        {"enterprise_relationship"=>{"parent_id"=>284, "child_id"=>285, "permissions_list"=>["add_to_order_cycle", "edit_profile", "create_variant_overrides"]}, "action"=>"create", "controller"=>"admin/enterprise_relationships"}
      # ./app/controllers/application_controller.rb:16:in `print_params'
      # ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
      # ------------------
      # --- Caused by: ---
      # ActiveModel::ForbiddenAttributesError:
      #   ActiveModel::ForbiddenAttributesError
      #   ./app/controllers/admin/enterprise_relationships_controller.rb:10:in `create'
2020-02-23 14:26:14 +01:00
luisramos0
86b0d71c7e Result of rubocop auto-correct and rebuilding rubocop_manual_todo 2019-05-28 12:57:29 +01:00
Rohan Mitchell
cb615ba994 Render enterprise relationships JSON with AMS instead of rabl 2014-08-25 13:07:31 +10:00
Rohan Mitchell
c2f762d570 Enterprise user can only see relationships involving their enterprises 2014-05-22 11:27:19 +10:00
Rohan Mitchell
06955a024f Enterprise user can only create relationships with their own enterprises as parent 2014-05-22 11:02:03 +10:00
Rohan Mitchell
5d0680234d Admin can delete enterprise relationships 2014-05-21 11:29:11 +10:00
Rohan Mitchell
b9a9937541 Attempting to create a relationship with invalid data shows an error message 2014-05-21 11:29:11 +10:00
Rohan Mitchell
9b2a80c6b5 Admin can create enterprise relationships 2014-05-21 11:29:11 +10:00
Rohan Mitchell
5f4e4ebeb0 Admin can list enterprise relationships 2014-05-21 11:29:11 +10:00
Rohan Mitchell
aa53d82386 Add stub page for managing enterprise relationships 2014-05-21 11:29:11 +10:00