diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-07 14:02:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-07 14:02:30 +0000 |
| commit | e8e9471c6171a8e7f38318f569eda67f9873c448 (patch) | |
| tree | 381f1380647e5499c9abcd3325491d0f94748392 | |
| parent | b30ebdaa1a704f4e81e91153b1b33a4c1c1a5c12 (diff) | |
| parent | d76a769d24b650f8dbfd6866b9d13c0acf4a9e4a (diff) | |
| download | gitlab-ce-e8e9471c6171a8e7f38318f569eda67f9873c448.tar.gz | |
Merge branch 'dont-assign-me-if-you-arent-allow' into 'master'
Hide "assign to me" link if not allowed
Fixes #14996
See merge request !3590
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 47e544acf52..94affa4b59a 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -1,5 +1,6 @@ %aside.right-sidebar{ class: sidebar_gutter_collapsed_class } .issuable-sidebar + - can_edit_issuable = can?(current_user, :"admin_#{issuable.to_ability_name}", @project) .block.issuable-sidebar-header %span.issuable-count.hide-collapsed.pull-left = issuable.iid @@ -29,7 +30,7 @@ .title.hide-collapsed Assignee = icon('spinner spin', class: 'block-loading') - - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project) + - if can_edit_issuable = link_to 'Edit', '#', class: 'edit-link pull-right' .value.bold.hide-collapsed - if issuable.assignee @@ -41,9 +42,10 @@ = issuable.assignee.to_reference - else %span.assign-yourself - No assignee - - %a.js-assign-yourself{ href: '#' } - assign yourself + No assignee + - if can_edit_issuable + %a.js-assign-yourself{ href: '#' } + \- assign yourself .selectbox.hide-collapsed = f.hidden_field 'assignee_id', value: issuable.assignee_id, id: 'issue_assignee_id' @@ -60,7 +62,7 @@ .title.hide-collapsed Milestone = icon('spinner spin', class: 'block-loading') - - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project) + - if can_edit_issuable = link_to 'Edit', '#', class: 'edit-link pull-right' .value.bold.hide-collapsed - if issuable.milestone @@ -82,7 +84,7 @@ .title.hide-collapsed Labels = icon('spinner spin', class: 'block-loading') - - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project) + - if can_edit_issuable = link_to 'Edit', '#', class: 'edit-link pull-right' .value.bold.issuable-show-labels.hide-collapsed{ class: ("has-labels" if issuable.labels.any?) } - if issuable.labels.any? |