From 9f0d794513d2ce1c990e61f4d21efe1dcad845fd Mon Sep 17 00:00:00 2001 From: Jose Ivan Vargas Date: Fri, 30 Dec 2016 11:30:25 -0600 Subject: Moved the webhooks and services gear options to a single one called integrations --- app/controllers/projects/hooks_controller.rb | 7 +++---- app/controllers/projects/services_controller.rb | 2 +- .../projects/settings/integrations_controller.rb | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 app/controllers/projects/settings/integrations_controller.rb (limited to 'app/controllers') diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb index 0ae8ff98009..8c52aa748ae 100644 --- a/app/controllers/projects/hooks_controller.rb +++ b/app/controllers/projects/hooks_controller.rb @@ -7,8 +7,7 @@ class Projects::HooksController < Projects::ApplicationController layout "project_settings" def index - @hooks = @project.hooks - @hook = ProjectHook.new + redirect_to namespace_project_settings_integrations_path(@project.namespace, @project) end def create @@ -16,7 +15,7 @@ class Projects::HooksController < Projects::ApplicationController @hook.save if @hook.valid? - redirect_to namespace_project_hooks_path(@project.namespace, @project) + redirect_to namespace_project_settings_integrations_path(@project.namespace, @project) else @hooks = @project.hooks.select(&:persisted?) render :index @@ -44,7 +43,7 @@ class Projects::HooksController < Projects::ApplicationController def destroy hook.destroy - redirect_to namespace_project_hooks_path(@project.namespace, @project) + redirect_to namespace_project_settings_integrations_path(@project.namespace, @project) end private diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index 30c2a5d9982..b4c40c6bf14 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -10,7 +10,7 @@ class Projects::ServicesController < Projects::ApplicationController layout "project_settings" def index - @services = @project.find_or_initialize_services + redirect_to namespace_project_settings_integrations_path(@project.namespace, @project) end def edit diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb new file mode 100644 index 00000000000..07563e45865 --- /dev/null +++ b/app/controllers/projects/settings/integrations_controller.rb @@ -0,0 +1,18 @@ +module Projects + module Settings + class IntegrationsController < Projects::ApplicationController + include ServiceParams + + before_action :authorize_admin_project! + + layout "project_settings" + def show + @hooks = @project.hooks + @hook = ProjectHook.new + + # Services + @services = @project.find_or_initialize_services + end + end + end +end -- cgit v1.2.1 From 373411d18d019f5321475e4b770cb36f4461a462 Mon Sep 17 00:00:00 2001 From: Jose Ivan Vargas Date: Mon, 16 Jan 2017 10:11:25 -0500 Subject: Corrected code style and titles --- app/controllers/projects/settings/integrations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb index 07563e45865..fb2a4837735 100644 --- a/app/controllers/projects/settings/integrations_controller.rb +++ b/app/controllers/projects/settings/integrations_controller.rb @@ -4,8 +4,8 @@ module Projects include ServiceParams before_action :authorize_admin_project! - layout "project_settings" + def show @hooks = @project.hooks @hook = ProjectHook.new -- cgit v1.2.1 From 0af99433143727088b6a0a1b2163751c05d80ce6 Mon Sep 17 00:00:00 2001 From: Jose Ivan Vargas Date: Wed, 18 Jan 2017 12:09:32 -0600 Subject: Removed the index action from both the projects hook and services controllers --- app/controllers/projects/hooks_controller.rb | 7 ++----- app/controllers/projects/services_controller.rb | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb index 8c52aa748ae..245c674f650 100644 --- a/app/controllers/projects/hooks_controller.rb +++ b/app/controllers/projects/hooks_controller.rb @@ -6,10 +6,6 @@ class Projects::HooksController < Projects::ApplicationController layout "project_settings" - def index - redirect_to namespace_project_settings_integrations_path(@project.namespace, @project) - end - def create @hook = @project.hooks.new(hook_params) @hook.save @@ -18,7 +14,8 @@ class Projects::HooksController < Projects::ApplicationController redirect_to namespace_project_settings_integrations_path(@project.namespace, @project) else @hooks = @project.hooks.select(&:persisted?) - render :index + flash[:alert] = @hook.errors.full_messages.join.html_safe + redirect_to namespace_project_settings_integrations_path(@project.namespace, @project) end end diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index b4c40c6bf14..17cb1d5be24 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -9,10 +9,6 @@ class Projects::ServicesController < Projects::ApplicationController layout "project_settings" - def index - redirect_to namespace_project_settings_integrations_path(@project.namespace, @project) - end - def edit end -- cgit v1.2.1 From 7b3ea49a4449686e512a5236c2d4073641afce77 Mon Sep 17 00:00:00 2001 From: Jose Ivan Vargas Date: Wed, 18 Jan 2017 15:40:16 -0600 Subject: Fixed tests and a rubocop linter --- app/controllers/projects/hooks_controller.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb index 245c674f650..b668a9331e7 100644 --- a/app/controllers/projects/hooks_controller.rb +++ b/app/controllers/projects/hooks_controller.rb @@ -10,13 +10,11 @@ class Projects::HooksController < Projects::ApplicationController @hook = @project.hooks.new(hook_params) @hook.save - if @hook.valid? - redirect_to namespace_project_settings_integrations_path(@project.namespace, @project) - else + unless @hook.valid? @hooks = @project.hooks.select(&:persisted?) flash[:alert] = @hook.errors.full_messages.join.html_safe - redirect_to namespace_project_settings_integrations_path(@project.namespace, @project) end + redirect_to namespace_project_settings_integrations_path(@project.namespace, @project) end def test -- cgit v1.2.1