Skip to content

Commit 69437f1

Browse files
committed
Add user mail to ViewCustomize.context
1 parent 946a979 commit 69437f1

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

README.ja.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ ViewCustomize = {
106106
"admin": true,
107107
"firstname": "Redmine",
108108
"lastname": "Admin",
109+
"mail": "admin@example.com",
109110
"lastLoginOn": "2019-09-22T14:44:53Z",
110111
"groups": [
111112
{"id": 5, "name": "Group1"}

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ ViewCustomize = {
111111
"admin": true,
112112
"firstname": "Redmine",
113113
"lastname": "Admin",
114+
"mail": "admin@example.com",
114115
"lastLoginOn": "2019-09-22T14:44:53Z",
115116
"groups": [
116117
{"id": 5, "name": "Group1"}

lib/redmine_view_customize/view_hook.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ def create_view_customize_context(view_hook_context)
124124
"admin" => user.admin?,
125125
"firstname" => user.firstname,
126126
"lastname" => user.lastname,
127+
"mail" => user.mail,
127128
"lastLoginOn" => (user.last_login_on.iso8601 unless user.last_login_on.nil?),
128129
"groups" => user.groups.map {|group| { "id" => group.id, "name" => group.name }},
129130
"apiKey" => (user.api_token.value unless user.api_token.nil?),

test/unit/view_customize_view_hook_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def test_view_layouts_base_html_head
7676
expected << "[0-9]+"
7777
expected << Regexp.escape("\" /><script type=\"text/javascript\">\n")
7878
expected << Regexp.escape("//<![CDATA[\n")
79-
expected << Regexp.escape("ViewCustomize = { context: {\"user\":{\"id\":1,\"login\":\"admin\",\"admin\":true,\"firstname\":\"Redmine\",\"lastname\":\"Admin\",\"lastLoginOn\":\"2006-07-19T20:57:52Z\",\"groups\":[],\"apiKey\":null,\"customFields\":[{\"id\":4,\"name\":\"Phone number\",\"value\":null},{\"id\":5,\"name\":\"Money\",\"value\":null}]},\"project\":{\"id\":1,\"identifier\":\"ecookbook\",\"name\":\"eCookbook\",\"roles\":[{\"id\":4,\"name\":\"Non member\"}],\"customFields\":[{\"id\":3,\"name\":\"Development status\",\"value\":\"Stable\"}]}} };\n")
79+
expected << Regexp.escape("ViewCustomize = { context: {\"user\":{\"id\":1,\"login\":\"admin\",\"admin\":true,\"firstname\":\"Redmine\",\"lastname\":\"Admin\",\"mail\":\"admin@somenet.foo\",\"lastLoginOn\":\"2006-07-19T20:57:52Z\",\"groups\":[],\"apiKey\":null,\"customFields\":[{\"id\":4,\"name\":\"Phone number\",\"value\":null},{\"id\":5,\"name\":\"Money\",\"value\":null}]},\"project\":{\"id\":1,\"identifier\":\"ecookbook\",\"name\":\"eCookbook\",\"roles\":[{\"id\":4,\"name\":\"Non member\"}],\"customFields\":[{\"id\":3,\"name\":\"Development status\",\"value\":\"Stable\"}]}} };\n")
8080
expected << Regexp.escape("//]]>\n")
8181
expected << Regexp.escape("</script>\n")
8282
expected << Regexp.escape("<!-- view customize id:1 -->\n")

0 commit comments

Comments
 (0)