bullet_train 1.3.15 → 1.3.16
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:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1c7c67395912d62c74ed42642fb51037668bfa8ea0564fabcbb42656c9eb781e
|
4
|
+
data.tar.gz: b29f54f1828514bba91bf11fcaef3f0ff9d9dbe004a01813df7bb15901f65325
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4e51c2facc7cc39166452820f19481f2f1da5c6a3aafa4cf1c7e6877b0763df43eacd6a5e6ea1fbdaa415f76be0f4636ca1a79f2864eb8b48d20c7d4ee882d62
|
7
|
+
data.tar.gz: c9a4ad75b5bd0f93c294b6f0a58a8412ee7fef251abdf214e30f37124d91767095fb3c9a007738649c0fc22e2c5ff95f752eeb9317ddddc527d70f5939b6e1f6
|
@@ -76,7 +76,7 @@ module Account::Invitations::ControllerBase
|
|
76
76
|
# POST /invitations/1/resend
|
77
77
|
def resend
|
78
78
|
@invitation = Invitation.find_by(uuid: params[:id])
|
79
|
-
if @invitation
|
79
|
+
if @invitation&.touch
|
80
80
|
UserMailer.invited(params[:id]).deliver_later
|
81
81
|
redirect_to account_team_invitations_path(@invitation.membership.team), notice: I18n.t("invitations.notifications.resent")
|
82
82
|
else
|
@@ -5,7 +5,6 @@ module Invitations::Base
|
|
5
5
|
belongs_to :team
|
6
6
|
belongs_to :from_membership, class_name: "Membership"
|
7
7
|
has_one :membership, dependent: :nullify
|
8
|
-
has_many :roles, through: :membership
|
9
8
|
|
10
9
|
accepts_nested_attributes_for :membership
|
11
10
|
|
@@ -15,6 +14,10 @@ module Invitations::Base
|
|
15
14
|
after_create :send_invitation_email
|
16
15
|
|
17
16
|
attribute :uuid, default: -> { SecureRandom.hex }
|
17
|
+
|
18
|
+
def roles
|
19
|
+
membership.roles
|
20
|
+
end
|
18
21
|
end
|
19
22
|
|
20
23
|
def set_added_by_membership
|
@@ -13,10 +13,26 @@ en:
|
|
13
13
|
confirmations:
|
14
14
|
destroy: Are you sure you want cancel the invitation to %{invitation_name}? The invitation they've received will no longer work. This can't be undone.
|
15
15
|
fields: &fields
|
16
|
+
id:
|
17
|
+
_: &id Invitation ID
|
18
|
+
label: *id
|
19
|
+
heading: *id
|
16
20
|
email:
|
17
|
-
|
21
|
+
_: &email Email Address
|
18
22
|
label: *email
|
19
23
|
heading: *email
|
24
|
+
uuid:
|
25
|
+
name: &uuid Invitation UUID
|
26
|
+
label: *uuid
|
27
|
+
heading: *uuid
|
28
|
+
from_membership_id:
|
29
|
+
name: &from_membership_id Who sent ID
|
30
|
+
label: *from_membership_id
|
31
|
+
heading: *from_membership_id
|
32
|
+
team_id:
|
33
|
+
name: &team_id Team ID
|
34
|
+
label: *team_id
|
35
|
+
heading: *team_id
|
20
36
|
roles: &role_ids
|
21
37
|
name: &roles Special Privileges
|
22
38
|
label: *roles
|
@@ -26,6 +42,9 @@ en:
|
|
26
42
|
created_at:
|
27
43
|
name: &created_at Sent
|
28
44
|
heading: *created_at
|
45
|
+
updated_at:
|
46
|
+
name: &updated_at Updated
|
47
|
+
heading: *updated_at
|
29
48
|
index:
|
30
49
|
section: "Invitations for %{team_name}"
|
31
50
|
header: Team Member Invitations
|
data/lib/bullet_train/version.rb
CHANGED