Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b3de65bc
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b3de65bc
编写于
1月 26, 2017
作者:
Z
Z.J. van de Weg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update #list_teams to propagate errors
上级
8bcc911b
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
12 addition
and
14 deletion
+12
-14
app/controllers/projects/mattermosts_controller.rb
app/controllers/projects/mattermosts_controller.rb
+1
-4
app/models/project_services/mattermost_slash_commands_service.rb
...els/project_services/mattermost_slash_commands_service.rb
+4
-4
app/views/projects/mattermosts/_no_teams.html.haml
app/views/projects/mattermosts/_no_teams.html.haml
+3
-2
app/views/projects/mattermosts/new.html.haml
app/views/projects/mattermosts/new.html.haml
+1
-1
lib/mattermost/client.rb
lib/mattermost/client.rb
+2
-2
spec/models/project_services/mattermost_slash_commands_service_spec.rb
...roject_services/mattermost_slash_commands_service_spec.rb
+1
-1
未找到文件。
app/controllers/projects/mattermosts_controller.rb
浏览文件 @
b3de65bc
...
...
@@ -34,10 +34,7 @@ class Projects::MattermostsController < Projects::ApplicationController
end
def
teams
@teams
||=
begin
teams
,
error_message
=
@service
.
list_teams
(
current_user
)
error_message
?
error_message
:
teams
end
@teams
,
@teams_error_message
=
@service
.
list_teams
(
current_user
)
end
def
service
...
...
app/models/project_services/mattermost_slash_commands_service.rb
浏览文件 @
b3de65bc
...
...
@@ -28,10 +28,10 @@ class MattermostSlashCommandsService < ChatSlashCommandsService
[
false
,
e
.
message
]
end
def
list_teams
(
user
)
Mattermost
::
Team
.
new
(
user
).
all
rescue
Mattermost
::
Error
[]
def
list_teams
(
current_
user
)
[
Mattermost
::
Team
.
new
(
current_user
).
all
,
nil
]
rescue
Mattermost
::
Error
=>
e
[
[],
e
.
message
]
end
private
...
...
app/views/projects/mattermosts/_no_teams.html.haml
浏览文件 @
b3de65bc
=
content_for
:flash_message
do
.alert.alert-danger
=
@teams
if
@teams
.
is_a?
(
String
)
-
if
@teams_error_message
=
content_for
:flash_message
do
.alert.alert-danger
=
@teams_error_message
%p
You aren’t a member of any team on the Mattermost instance at
...
...
app/views/projects/mattermosts/new.html.haml
浏览文件 @
b3de65bc
...
...
@@ -2,7 +2,7 @@
.inline.pull-right
=
custom_icon
(
'mattermost_logo'
,
size:
48
)
%h3
Install Mattermost Command
-
if
@teams
.
is_a?
(
String
)
||
@teams
.
empty?
-
if
@teams
.
empty?
=
render
'no_teams'
-
else
=
render
'team_selection'
lib/mattermost/client.rb
浏览文件 @
b3de65bc
...
...
@@ -27,12 +27,12 @@ module Mattermost
end
def
json_response
(
response
)
json_response
=
JSON
.
parse
(
response
.
body
)
unless
response
.
success?
raise
Mattermost
::
ClientError
.
new
(
json_response
[
'message'
]
||
'Undefined error'
)
end
json_response
=
JSON
.
parse
(
response
.
body
)
json_response
rescue
JSON
::
JSONError
raise
Mattermost
::
ClientError
.
new
(
'Cannot parse response'
)
...
...
spec/models/project_services/mattermost_slash_commands_service_spec.rb
浏览文件 @
b3de65bc
...
...
@@ -113,7 +113,7 @@ describe MattermostSlashCommandsService, :models do
end
it
'shows error messages'
do
expect
(
subject
).
to
eq
([])
expect
(
subject
).
to
eq
([
[],
"Failed to get team list."
])
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录