BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f1360966
Unverified
Commit
f1360966
authored
Feb 09, 2018
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor modify_file_link
parent
4c8f8f4f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
5 deletions
+18
-5
blob_helper.rb
app/helpers/blob_helper.rb
+18
-5
No files found.
app/helpers/blob_helper.rb
View file @
f1360966
...
...
@@ -27,7 +27,7 @@ module BlobHelper
elsif
!
current_user
||
(
current_user
&&
can_modify_blob?
(
blob
,
project
,
ref
))
edit_link_tag
(
edit_text
,
edit_blob_path
(
project
,
ref
,
path
,
options
),
common_classes
)
elsif
current_user
&&
can?
(
current_user
,
:fork_project
,
project
)
edit_blob_fork
(
common_classes
,
edit_blob_path
(
project
,
ref
,
path
,
options
),
project
,
edit_in_new_fork_notice
)
edit_blob_fork
(
common_classes
,
edit_blob_path
(
project
,
ref
,
path
,
options
),
project
)
end
end
...
...
@@ -56,7 +56,7 @@ module BlobHelper
elsif
current_user
&&
can_modify_blob?
(
blob
,
project
,
ref
)
edit_link_tag
(
ide_edit_text
,
ide_edit_path
(
project
,
ref
,
path
,
options
),
common_classes
)
elsif
current_user
&&
can?
(
current_user
,
:fork_project
,
project
)
edit_blob_fork
(
common_classes
,
edit_blob_path
(
project
,
ref
,
path
,
options
),
project
,
edit_in_new_fork_notice
)
edit_blob_fork
(
common_classes
,
edit_blob_path
(
project
,
ref
,
path
,
options
),
project
)
end
end
...
...
@@ -76,7 +76,7 @@ module BlobHelper
elsif
can_modify_blob?
(
blob
,
project
,
ref
)
button_tag
label
,
class:
"
#{
common_classes
}
"
,
'data-target'
=>
"#modal-
#{
modal_type
}
-blob"
,
'data-toggle'
=>
'modal'
elsif
can?
(
current_user
,
:fork_project
,
project
)
edit_
blob_fork
(
common_classes
,
request
.
fullpath
,
project
,
edit_in_new_fork_notice_action
(
action
),
action
)
edit_
modify_file_fork
(
action
,
common_classes
,
label
,
project
)
end
end
...
...
@@ -311,16 +311,29 @@ module BlobHelper
blob
if
blob
&
.
readable_text?
end
def
edit_blob_fork
(
common_classes
,
path
,
project
,
notice
,
action
=
'edit'
)
def
edit_blob_fork
(
common_classes
,
path
,
project
)
continue_params
=
{
to:
path
,
notice:
notice
,
notice:
edit_in_new_fork_
notice
,
notice_now:
edit_in_new_fork_notice_now
}
fork_path
=
project_forks_path
(
project
,
namespace_key:
current_user
.
namespace
.
id
,
continue:
continue_params
)
button_tag
edit_text
,
class:
"
#{
common_classes
}
js-edit-blob-link-fork-toggler"
,
data:
{
action:
'edit'
,
fork_path:
fork_path
}
end
def
edit_modify_file_fork
(
action
,
common_classes
,
label
,
project
)
continue_params
=
{
to:
request
.
fullpath
,
notice:
edit_in_new_fork_notice
+
" Try to
#{
action
}
this file again."
,
notice_now:
edit_in_new_fork_notice_now
}
fork_path
=
project_forks_path
(
project
,
namespace_key:
current_user
.
namespace
.
id
,
continue:
continue_params
)
button_tag
label
,
class:
"
#{
common_classes
}
js-edit-blob-link-fork-toggler"
,
data:
{
action:
action
,
fork_path:
fork_path
}
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment