diff --git a/app/controllers/repository_columns_controller.rb b/app/controllers/repository_columns_controller.rb index 29b0e89cc..6c02dc3cf 100644 --- a/app/controllers/repository_columns_controller.rb +++ b/app/controllers/repository_columns_controller.rb @@ -94,7 +94,7 @@ class RepositoryColumnsController < ApplicationController format.json do render json: { html: render_to_string( - partial: 'repositories/delete_column_modal_body.html.erb', + partial: 'repository_columns/delete_column_modal_body.html.erb', locals: { column_index: params[:column_index] } ) } @@ -104,6 +104,7 @@ class RepositoryColumnsController < ApplicationController def destroy @del_repository_column = @repository_column.dup + column_id = @repository_column.id respond_to do |format| format.json do if @repository_column.destroy diff --git a/app/views/repository_columns/_manage_column_modal.html.erb b/app/views/repository_columns/_manage_column_modal.html.erb index 99958e4fd..5a75da638 100644 --- a/app/views/repository_columns/_manage_column_modal.html.erb +++ b/app/views/repository_columns/_manage_column_modal.html.erb @@ -32,11 +32,11 @@ checked: checked?(@repository_column, 'RepositoryTextValue'.freeze), disabled: disabled?(@repository_column, 'RepositoryTextValue'.freeze) %> <%= f.radio_button :data_type, - 'RepositoryFileValue'.freeze, + 'RepositoryAssetValue'.freeze, label: t('libraries.manange_modal_column.labels.file'), inline: true, - checked: checked?(@repository_column, 'RepositoryFileValue'.freeze), - disabled: disabled?(@repository_column, 'RepositoryFileValue'.freeze) %> + checked: checked?(@repository_column, 'RepositoryAssetValue'.freeze), + disabled: disabled?(@repository_column, 'RepositoryAssetValue'.freeze) %> <%= f.radio_button :data_type, 'RepositoryListValue'.freeze, label: t('libraries.manange_modal_column.labels.dropdown'), diff --git a/app/views/repository_columns/index.html.erb b/app/views/repository_columns/index.html.erb index 67623c8e2..ffafa0210 100644 --- a/app/views/repository_columns/index.html.erb +++ b/app/views/repository_columns/index.html.erb @@ -3,7 +3,8 @@
<%= link_to t('libraries.repository_columns.index.back_to_repository_html', repository: @repository.name), - repository_path(@repository) %> + repository_path(@repository), + data: { turbolinks: false } %>