bullet_train 1.1.1 → 1.1.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9b766f450a6f4015dc33ff340dbca7fc53957ec141989ab6d16767eb3a1346d0
4
- data.tar.gz: cc618ee0814669b150d82213304dd51cff59f63b5e7642532965cee14012b9c1
3
+ metadata.gz: 459bb309e4ce417a30b412a93a4b590fe3735e3474a40490804213c999ba4332
4
+ data.tar.gz: 109a8f50ab47b310aedc400adffef6fa78d7fcdb0eb0e0f5512c3f947b2bdf01
5
5
  SHA512:
6
- metadata.gz: e37d31a4c45c4c321b7cbadb72a0916a0ec3d66786075c56331d4582574248c5cca4875595979eb6baf3856fa11a27b962a5964a699dcc53429352ec97e2405c
7
- data.tar.gz: 3aadef0e8b9e0a7048fb948a98f7266ec609dd5940d25b43d3f256e47d14207951f68954a80d62b6002b3d42704933360f139a47598b3266eb7cc9b25a6ab238
6
+ metadata.gz: dd250cd1bf923513cf37bc81a225aacd8b91436566e8e49414e2ec8adeacbc3a23ac099f5e1c3eacd456ac0f0a8157d1345edfcf8c89094a309139e03174dc55
7
+ data.tar.gz: d2ecef35d6faa0f3eef74ec2ee8b785cfaea38812249f206790d296832ab3051639a68d8426a73d6d935793dec07a6ee75126c2b84c08cec3ff75c42db5842be
@@ -18,6 +18,10 @@ module Account::Teams::ControllerBase
18
18
  # for magic locales.
19
19
  @child_object = @team
20
20
  end
21
+
22
+ private
23
+
24
+ include strong_parameters_from_api
21
25
  end
22
26
 
23
27
  # GET /teams
@@ -124,17 +128,4 @@ module Account::Teams::ControllerBase
124
128
  def process_params(strong_params)
125
129
  raise "It looks like you've removed `process_params` from your controller. This will break Super Scaffolding."
126
130
  end
127
-
128
- # Never trust parameters from the scary internet, only allow the white list through.
129
- def team_params
130
- strong_params = params.require(:team).permit(
131
- :name,
132
- :time_zone,
133
- :locale,
134
- *permitted_fields,
135
- *permitted_arrays,
136
- )
137
-
138
- process_params(strong_params)
139
- end
140
131
  end
@@ -55,6 +55,7 @@ module Account::Users::ControllerBase
55
55
  end
56
56
 
57
57
  # Never trust parameters from the scary internet, only allow the white list through.
58
+ # TODO Update this to use `include strong_parameters_from_api`.
58
59
  def user_params
59
60
  # TODO enforce permissions on updating the user's team name.
60
61
  strong_params = params.require(:user).permit(
@@ -20,6 +20,7 @@ module Users::Base
20
20
  has_many :memberships, dependent: :destroy
21
21
  has_many :scaffolding_absolutely_abstract_creative_concepts_collaborators, through: :memberships
22
22
  has_many :teams, through: :memberships
23
+ has_many :collaborating_users, through: :teams, source: :users
23
24
  belongs_to :current_team, class_name: "Team", optional: true
24
25
  accepts_nested_attributes_for :current_team
25
26
 
@@ -1,3 +1,3 @@
1
1
  module BulletTrain
2
- VERSION = "1.1.1"
2
+ VERSION = "1.1.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bullet_train
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Culver