From cdaac6a01bd2ed8c4a7e21f59e2d5ac8858ca3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Zrim=C5=A1ek?= Date: Tue, 30 May 2017 15:11:28 +0200 Subject: [PATCH] Added remove repository modal logic. [SCI-1269] --- app/assets/javascripts/repositories/index.js | 19 +++++++++++++++++++ app/controllers/repositories_controller.rb | 13 +++++++++++++ .../_delete_repository_modal.html.erb | 8 ++++---- app/views/repositories/index.html.erb | 6 ++++-- config/routes.rb | 4 +++- 5 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 app/assets/javascripts/repositories/index.js diff --git a/app/assets/javascripts/repositories/index.js b/app/assets/javascripts/repositories/index.js new file mode 100644 index 000000000..59c99641a --- /dev/null +++ b/app/assets/javascripts/repositories/index.js @@ -0,0 +1,19 @@ +(function() { + 'use strict'; + + // Show modal for repository deletion + $(document).on('click', '#delete-repo-option', function() { + var url = $(this).attr('href'); + $.ajax({ + method: 'GET', + url: url, + dataType: 'json' + }).done(function(xhr, settings, data) { + $('body').append($.parseHTML(data.responseJSON.html)); + $('#delete-repo-modal').modal('show', { + backdrop: true, + keyboard: false + }); + }); + }); +})(); diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index e70eb914f..b784e2d82 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -6,6 +6,19 @@ class RepositoriesController < ApplicationController render('repositories/index') end + def destroy_modal + @repository = Repository.find(params[:repository_id]) + respond_to do |format| + format.json do + render json: { + html: render_to_string( + partial: 'delete_repository_modal.html.erb' + ) + } + end + end + end + def destroy @repo = Repository.find(params[:id]) @repo.destroy if @repo diff --git a/app/views/repositories/_delete_repository_modal.html.erb b/app/views/repositories/_delete_repository_modal.html.erb index 728ac182b..589e27c81 100644 --- a/app/views/repositories/_delete_repository_modal.html.erb +++ b/app/views/repositories/_delete_repository_modal.html.erb @@ -1,12 +1,12 @@ -