Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
81eacd1b
Commit
81eacd1b
authored
Sep 28, 2014
by
Ciro Santilli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable / hide MR edit blob button if cannot edit.
parent
b0349915
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
15 deletions
+30
-15
app/helpers/tree_helper.rb
app/helpers/tree_helper.rb
+26
-5
app/views/projects/blob/_actions.html.haml
app/views/projects/blob/_actions.html.haml
+1
-7
app/views/projects/diffs/_file.html.haml
app/views/projects/diffs/_file.html.haml
+3
-3
No files found.
app/helpers/tree_helper.rb
View file @
81eacd1b
...
@@ -53,13 +53,34 @@ module TreeHelper
...
@@ -53,13 +53,34 @@ module TreeHelper
File
.
join
(
*
args
)
File
.
join
(
*
args
)
end
end
def
allowed_tree_edit?
def
allowed_tree_edit?
(
project
=
nil
,
ref
=
nil
)
return
false
unless
@repository
.
branch_names
.
include?
(
@ref
)
project
||=
@project
ref
||=
@ref
return
false
unless
project
.
repository
.
branch_names
.
include?
(
ref
)
if
@project
.
protected_branch?
@
ref
if
project
.
protected_branch?
ref
can?
(
current_user
,
:push_code_to_protected_branches
,
@
project
)
can?
(
current_user
,
:push_code_to_protected_branches
,
project
)
else
else
can?
(
current_user
,
:push_code
,
@project
)
can?
(
current_user
,
:push_code
,
project
)
end
end
def
edit_blob_link
(
project
,
ref
,
path
,
options
=
{})
if
project
.
repository
.
blob_at
(
ref
,
path
).
text?
text
=
'Edit'
after
=
options
[
:after
]
||
''
from_mr
=
options
[
:from_merge_request_id
]
link_opts
=
{}
link_opts
[
:from_merge_request_id
]
=
from_mr
if
from_mr
cls
=
'btn btn-small'
if
allowed_tree_edit?
(
project
,
ref
)
link_to
text
,
project_edit_tree_path
(
project
,
tree_join
(
ref
,
path
),
link_opts
),
class:
cls
else
content_tag
:span
,
text
,
class:
cls
+
' disabled'
end
+
after
.
html_safe
else
''
end
end
end
end
...
...
app/views/projects/blob/_actions.html.haml
View file @
81eacd1b
.btn-group.tree-btn-group
.btn-group.tree-btn-group
-# only show edit link for text files
=
edit_blob_link
(
@project
,
@ref
,
@path
)
-
if
@blob
.
text?
-
if
allowed_tree_edit?
=
link_to
'Edit'
,
project_edit_tree_path
(
@project
,
@id
),
class:
'btn btn-small'
-
else
%span
.btn.btn-small.disabled
Edit
=
link_to
'Raw'
,
project_raw_path
(
@project
,
@id
),
=
link_to
'Raw'
,
project_raw_path
(
@project
,
@id
),
class:
'btn btn-small'
,
target:
'_blank'
class:
'btn btn-small'
,
target:
'_blank'
-# only show normal/blame view links for text files
-# only show normal/blame view links for text files
...
...
app/views/projects/diffs/_file.html.haml
View file @
81eacd1b
...
@@ -27,9 +27,9 @@
...
@@ -27,9 +27,9 @@
-
if
@merge_request
&&
@merge_request
.
source_project
-
if
@merge_request
&&
@merge_request
.
source_project
=
link_to
project_edit_tree_path
(
@merge_request
.
source_project
,
tree_join
(
@merge_request
.
source_branch
,
diff_file
.
new_path
),
from_merge_request_id:
@merge_request
.
id
),
{
class:
'btn btn-small'
}
do
=
edit_blob_link
(
@merge_request
.
source_project
,
Edit
@merge_request
.
source_branch
,
diff_file
.
new_path
,
after:
' '
,
from_merge_request_id:
@merge_request
.
id
)
=
view_file_btn
(
@commit
.
id
,
diff_file
,
project
)
=
view_file_btn
(
@commit
.
id
,
diff_file
,
project
)
...
...
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