download export now working
This commit is contained in:
parent
41163fd552
commit
05edd5e6dc
|
@ -190,11 +190,15 @@ class ProjectsController < Projects::ApplicationController
|
|||
::Projects::ImportExport::ExportService.new(@project, current_user).execute
|
||||
|
||||
redirect_to(
|
||||
project_path(@project),
|
||||
edit_project_path(@project),
|
||||
notice: "Project export successfully started"
|
||||
)
|
||||
end
|
||||
|
||||
def download_export
|
||||
send_file export_project_path, disposition: 'attachment'
|
||||
end
|
||||
|
||||
def toggle_star
|
||||
current_user.toggle_star(@project)
|
||||
@project.reload
|
||||
|
@ -256,4 +260,9 @@ class ProjectsController < Projects::ApplicationController
|
|||
def get_id
|
||||
project.repository.root_ref
|
||||
end
|
||||
|
||||
def export_project_path
|
||||
# TODO: move this, probably to ImportExport and refactor
|
||||
File.join(Settings.shared['path'], 'tmp/project_exports', @project.path_with_namespace, 'project.tar.gz')
|
||||
end
|
||||
end
|
||||
|
|
|
@ -133,7 +133,7 @@
|
|||
method: :post, class: "btn btn-default"
|
||||
|
||||
.panel.panel-default
|
||||
.panel-heading Export
|
||||
.panel-heading Export project
|
||||
.errors-holder
|
||||
.panel-body
|
||||
%p
|
||||
|
@ -141,9 +141,12 @@
|
|||
%br
|
||||
|
||||
.form-actions
|
||||
= link_to 'Export', export_namespace_project_path(@project.namespace, @project),
|
||||
= link_to 'Generate new export', export_namespace_project_path(@project.namespace, @project),
|
||||
method: :post, class: "btn btn-default"
|
||||
|
||||
= link_to 'Download export', download_export_namespace_project_path(@project.namespace, @project),
|
||||
method: :post, class: "btn btn-default"
|
||||
|
||||
|
||||
- if can? current_user, :archive_project, @project
|
||||
- if @project.archived?
|
||||
|
|
|
@ -434,6 +434,7 @@ Rails.application.routes.draw do
|
|||
post :toggle_star
|
||||
post :markdown_preview
|
||||
post :export
|
||||
post :download_export
|
||||
get :autocomplete_sources
|
||||
get :activity
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue