implements the form for renaming the new filename on the file edit page

This commit is contained in:
tiagonbotelho 2016-07-01 16:32:56 +01:00
parent 850bb6db2f
commit b34310ae9e
3 changed files with 8 additions and 2 deletions

View file

@ -43,7 +43,8 @@ class Projects::BlobController < Projects::ApplicationController
diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) +
"#file-path-#{hexdigest(@path)}"
else
namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path))
# params[:file_name] stores the new name for the file
namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name]))
end
create_commit(Files::UpdateService, success_path: after_edit_path,

View file

@ -3,6 +3,7 @@ require_relative "base_service"
module Files
class UpdateService < Files::BaseService
def commit
# Need to update file_path with the new filename
repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true)
end
end

View file

@ -4,7 +4,11 @@
= icon('code-fork')
= ref
%span.editor-file-name
= @path
- if current_action?(:edit) && can?(current_user, :push_code, @project)
= text_field_tag 'file_name', params[:file_name], placeholder: @path,
class: 'form-control new-file-name'
- else
= @path
- if current_action?(:new) || current_action?(:create)
%span.editor-file-name