Commit 6ade6e2b authored by James Lopez's avatar James Lopez

fix specs

parent 50ccc6dc
...@@ -84,7 +84,7 @@ module BlobHelper ...@@ -84,7 +84,7 @@ module BlobHelper
elsif can_modify_blob?(blob, project, ref) elsif can_modify_blob?(blob, project, ref)
button_tag label, class: "#{common_classes}", 'data-target' => "#modal-#{modal_type}-blob", 'data-toggle' => 'modal' button_tag label, class: "#{common_classes}", 'data-target' => "#modal-#{modal_type}-blob", 'data-toggle' => 'modal'
elsif can?(current_user, :fork_project, project) elsif can?(current_user, :fork_project, project)
edit_fork_button_tag(common_classes, project, label, edit_modify_file_fork_params(action)) edit_fork_button_tag(common_classes, project, label, edit_modify_file_fork_params(action), action)
end end
end end
...@@ -331,16 +331,17 @@ module BlobHelper ...@@ -331,16 +331,17 @@ module BlobHelper
{ {
to: request.fullpath, to: request.fullpath,
notice: edit_in_new_fork_notice_action(action), notice: edit_in_new_fork_notice_action(action),
notice_now: edit_in_new_fork_notice_now notice_now: edit_in_new_fork_notice_now,
action: action
} }
end end
def edit_fork_button_tag(common_classes, project, label, params) def edit_fork_button_tag(common_classes, project, label, params, action = 'edit')
fork_path = project_forks_path(project, namespace_key: current_user.namespace.id, continue: params) fork_path = project_forks_path(project, namespace_key: current_user.namespace.id, continue: params)
button_tag edit_text, button_tag label,
class: "#{common_classes} js-edit-blob-link-fork-toggler", class: "#{common_classes} js-edit-blob-link-fork-toggler",
data: { action: 'edit', fork_path: fork_path } data: { action: action, fork_path: fork_path }
end end
def edit_button_tag(button_text, common_classes) def edit_button_tag(button_text, common_classes)
......
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