diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-04-07 08:32:37 -0400 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-04-07 08:32:37 -0400 |
| commit | d76a769d24b650f8dbfd6866b9d13c0acf4a9e4a (patch) | |
| tree | a1031186290445774b0b304fc43df65c16ec08a2 | |
| parent | 92649ca97a02021695eb4dc36fa59c1a8454bd11 (diff) | |
| download | gitlab-ce-d76a769d24b650f8dbfd6866b9d13c0acf4a9e4a.tar.gz | |
Remove duplication. Remove JS data attributes
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 43883a18fa9..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 @@ -20,7 +21,6 @@ Next = form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f| - - can_edit_assignee = can?(current_user, :"admin_#{issuable.to_ability_name}", @project) .block.assignee .sidebar-collapsed-icon.sidebar-collapsed-user{data: {toggle: "tooltip", placement: "left", container: "body"}, title: (issuable.assignee.to_reference if issuable.assignee)} - if issuable.assignee @@ -30,9 +30,9 @@ .title.hide-collapsed Assignee = icon('spinner spin', class: 'block-loading') - - if can_edit_assignee + - if can_edit_issuable = link_to 'Edit', '#', class: 'edit-link pull-right' - .value.bold.hide-collapsed{data: {can_edit_assign: can_edit_assignee}} + .value.bold.hide-collapsed - if issuable.assignee = link_to_member(@project, issuable.assignee, size: 32) do - if issuable.instance_of?(MergeRequest) && !issuable.can_be_merged_by?(issuable.assignee) @@ -43,7 +43,7 @@ - else %span.assign-yourself No assignee - - if can_edit_assignee + - if can_edit_issuable %a.js-assign-yourself{ href: '#' } \- assign yourself @@ -62,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 @@ -84,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? |