BigW Consortium Gitlab

Commit e2e588d2 by tiagonbotelho

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

parent 021b6aef
...@@ -43,7 +43,8 @@ class Projects::BlobController < Projects::ApplicationController ...@@ -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) + diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) +
"#file-path-#{hexdigest(@path)}" "#file-path-#{hexdigest(@path)}"
else 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 end
create_commit(Files::UpdateService, success_path: after_edit_path, create_commit(Files::UpdateService, success_path: after_edit_path,
......
...@@ -3,6 +3,7 @@ require_relative "base_service" ...@@ -3,6 +3,7 @@ require_relative "base_service"
module Files module Files
class UpdateService < Files::BaseService class UpdateService < Files::BaseService
def commit 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) repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true)
end end
end end
......
...@@ -4,7 +4,11 @@ ...@@ -4,7 +4,11 @@
= icon('code-fork') = icon('code-fork')
= ref = ref
%span.editor-file-name %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) - if current_action?(:new) || current_action?(:create)
%span.editor-file-name %span.editor-file-name
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment