approval 0.3.4 → 0.3.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/locales/en.yml +15 -2
- data/config/locales/ja.yml +14 -1
- data/lib/approval/models/approval/request_form/create.rb +1 -1
- data/lib/approval/models/approval/request_form/destroy.rb +1 -1
- data/lib/approval/models/approval/request_form/update.rb +1 -1
- data/lib/approval/models/approval/respond_form/approve.rb +2 -2
- data/lib/approval/models/approval/respond_form/cancel.rb +2 -2
- data/lib/approval/models/approval/respond_form/reject.rb +2 -2
- data/lib/approval/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1e5565e3f6c257574039cad1c483a21489d18c15
|
4
|
+
data.tar.gz: f51f115da397201f00071fe460e09f25d491ecbf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4b0f80d3cd453758bbc95b07f57e9b379940f61242e19dc348a5ad96c327f4599d5ad15a96b6f067dc2c9662632c3b1dd9a8eca73c7aad674abbf0bdc47cb883
|
7
|
+
data.tar.gz: 8613e89392f7b110b2871a1a8849ae0dbfa1f3c15121bc7f23c70ec1e0980e0447f56a024e57a5fbf782a1ac042e60ef85045cb60dd9128fa8d1f07878b64004
|
data/config/locales/en.yml
CHANGED
@@ -5,12 +5,25 @@ en:
|
|
5
5
|
cannot_respond_to_own_request: "cannot respond to own request."
|
6
6
|
|
7
7
|
attributes:
|
8
|
+
id: "ID"
|
8
9
|
reason: "Reason"
|
10
|
+
created_at: "Created at"
|
11
|
+
updated_at: "Updated at"
|
9
12
|
|
10
13
|
activerecord:
|
11
|
-
|
12
|
-
approval/
|
14
|
+
models:
|
15
|
+
approval/comment: "Approval Comment"
|
16
|
+
approval/item: "Approval Item"
|
17
|
+
approval/request: "Approval Request"
|
13
18
|
attributes:
|
19
|
+
approval/comment:
|
20
|
+
user: "User"
|
21
|
+
content: "Content"
|
22
|
+
approval/item:
|
23
|
+
resource_type: "Resource type"
|
24
|
+
resource_id: "Resource ID"
|
25
|
+
event: "Event"
|
26
|
+
params: "Parameters"
|
14
27
|
approval/request:
|
15
28
|
request_user: "Requested user"
|
16
29
|
respond_user: "Responded user"
|
data/config/locales/ja.yml
CHANGED
@@ -5,12 +5,25 @@ ja:
|
|
5
5
|
cannot_respond_to_own_request: "は自身の申請のため対応できません"
|
6
6
|
|
7
7
|
attributes:
|
8
|
+
id: ID
|
8
9
|
reason: 理由
|
10
|
+
created_at: 作成日時
|
11
|
+
updated_at: 更新日時
|
9
12
|
|
10
13
|
activerecord:
|
11
|
-
|
14
|
+
models:
|
15
|
+
approval/comment: コメント
|
16
|
+
approval/item: 対象リソース
|
12
17
|
approval/request: 申請
|
13
18
|
attributes:
|
19
|
+
approval/comment:
|
20
|
+
user: ユーザー
|
21
|
+
content: 内容
|
22
|
+
approval/item:
|
23
|
+
resource_type: リソース種別
|
24
|
+
resource_id: リソースID
|
25
|
+
event: イベント
|
26
|
+
params: パラメータ
|
14
27
|
approval/request:
|
15
28
|
request_user: 申請者
|
16
29
|
respond_user: 対応者
|
@@ -8,8 +8,8 @@ module Approval
|
|
8
8
|
def prepare
|
9
9
|
::Approval::Request.transaction do
|
10
10
|
request.lock!
|
11
|
-
request.assign_attributes(state: :approved, approved_at: Time.current,
|
12
|
-
request.comments.new(
|
11
|
+
request.assign_attributes(state: :approved, approved_at: Time.current, respond_user_id: user.id)
|
12
|
+
request.comments.new(user_id: user.id, content: reason)
|
13
13
|
request.items.each(&:apply)
|
14
14
|
yield(request)
|
15
15
|
end
|
@@ -6,8 +6,8 @@ module Approval
|
|
6
6
|
def prepare
|
7
7
|
::Approval::Request.transaction do
|
8
8
|
request.lock!
|
9
|
-
request.assign_attributes(state: :cancelled, cancelled_at: Time.current,
|
10
|
-
request.comments.new(
|
9
|
+
request.assign_attributes(state: :cancelled, cancelled_at: Time.current, respond_user_id: user.id)
|
10
|
+
request.comments.new(user_id: user.id, content: reason)
|
11
11
|
yield(request)
|
12
12
|
end
|
13
13
|
end
|
@@ -8,8 +8,8 @@ module Approval
|
|
8
8
|
def prepare
|
9
9
|
::Approval::Request.transaction do
|
10
10
|
request.lock!
|
11
|
-
request.assign_attributes(state: :rejected, rejected_at: Time.current,
|
12
|
-
request.comments.new(
|
11
|
+
request.assign_attributes(state: :rejected, rejected_at: Time.current, respond_user_id: user.id)
|
12
|
+
request.comments.new(user_id: user.id, content: reason)
|
13
13
|
yield(request)
|
14
14
|
end
|
15
15
|
end
|
data/lib/approval/version.rb
CHANGED