diff options
author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-07 10:24:57 +0300 |
---|---|---|
committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-16 11:19:28 +0300 |
commit | 8ddbc43576c1cebd652d6f3541574f0176794510 (patch) | |
tree | 3dfe430f289db8a461220d26f19689013471d363 /app/services | |
parent | b4244efaf1ab955e5900e87c3ec4e9465ba38bff (diff) |
Improve DRYness of views
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/groups/create_service.rb | 4 | ||||
-rw-r--r-- | app/services/groups/update_service.rb | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb index aabd3c4bd05..13d1b545498 100644 --- a/app/services/groups/create_service.rb +++ b/app/services/groups/create_service.rb @@ -6,6 +6,7 @@ module Groups def execute create_chat_team = params.delete(:create_chat_team) + team_name = params.delete(:chat_team_name) @group = Group.new(params) @@ -26,7 +27,8 @@ module Groups @group.add_owner(current_user) if create_chat_team && Gitlab.config.mattermost.enabled - Mattermost::CreateTeamWorker.perform_async(@group.id, current_user.id) + options = team_name ? { name: team_name } : {} + Mattermost::CreateTeamWorker.perform_async(@group.id, current_user.id, options) end @group diff --git a/app/services/groups/update_service.rb b/app/services/groups/update_service.rb index 4e878ec556a..aff42ad598c 100644 --- a/app/services/groups/update_service.rb +++ b/app/services/groups/update_service.rb @@ -1,6 +1,11 @@ module Groups class UpdateService < Groups::BaseService def execute + if params.delete(:create_chat_team) == '1' + chat_name = params[:chat_team_name] + options = chat_name ? { name: chat_name } : {} + end + # check that user is allowed to set specified visibility_level new_visibility = params[:visibility_level] if new_visibility && new_visibility.to_i != group.visibility_level |