backport haml changes

9 files changed, 50 insertions, 42 deletions

diff --git a/app/views/shared/boards/components/_board.html.haml b/app/views/shared/boards/components/_board.html.haml
index 64f5f6d7ba0..ce0aa72ab00 100644
--- a/app/views/shared/boards/components/_board.html.haml
+++ b/app/views/shared/boards/components/_board.html.haml
@@ -7,20 +7,26 @@
           ":class": "{ \"fa-caret-down\": list.isExpanded, \"fa-caret-right\": !list.isExpanded && list.position === -1, \"fa-caret-left\": !list.isExpanded && list.position !== -1 }",
           "aria-hidden": "true" }
 
-        %span.has-tooltip{ "v-if": "list.type !== \"label\"",
+        %span.board-title-text.has-tooltip{ "v-if": "list.type !== \"label\"",
           ":title" => '(list.label ? list.label.description : "")' }
           {{ list.title }}
 
         %span.has-tooltip{ "v-if": "list.type === \"label\"",
           ":title" => '(list.label ? list.label.description : "")',
           data: { container: "body", placement: "bottom" },
-          class: "label color-label title",
+          class: "label color-label title board-title-text",
           ":style" => "{ backgroundColor: (list.label && list.label.color ? list.label.color : null), color: (list.label && list.label.color ? list.label.text_color : \"#2e2e2e\") }" }
           {{ list.title }}
-        .issue-count-badge.pull-right.clearfix{ "v-if" => 'list.type !== "blank"' }
+        - if can?(current_user, :admin_list, current_board_parent)
+          %board-delete{ "inline-template" => true,
+            ":list" => "list",
+            "v-if" => "!list.preset && list.id" }
+            %button.board-delete.has-tooltip.pull-right{ type: "button", title: "Delete list", "aria-label" => "Delete list", data: { placement: "bottom" }, "@click.stop" => "deleteBoard" }
+              = icon("trash")
+        .issue-count-badge.clearfix{ "v-if" => 'list.type !== "blank"' }
           %span.issue-count-badge-count.pull-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' }
             {{ list.issuesSize }}
-          - if can?(current_user, :admin_issue, @project)
+          - if can?(current_user, :admin_list, current_board_parent)
             %button.issue-count-badge-add-button.btn.btn-small.btn-default.has-tooltip.js-no-trigger-collapse{ type: "button",
               "@click" => "showNewIssueForm",
               "v-if" => 'list.type !== "closed"',
@@ -28,12 +34,7 @@
               "title" => "New issue",
               data: { placement: "top", container: "body" } }
               = icon("plus", class: "js-no-trigger-collapse")
-        - if can?(current_user, :admin_list, @project)
-          %board-delete{ "inline-template" => true,
-            ":list" => "list",
-            "v-if" => "!list.preset && list.id" }
-            %button.board-delete.has-tooltip.pull-right{ type: "button", title: "Delete list", "aria-label" => "Delete list", data: { placement: "bottom" }, "@click.stop" => "deleteBoard" }
-              = icon("trash")
+
     %board-list{ "v-if" => 'list.type !== "blank"',
       ":list" => "list",
       ":issues" => "list.issues",
@@ -42,5 +43,5 @@
       ":issue-link-base" => "issueLinkBase",
       ":root-path" => "rootPath",
       "ref" => "board-list" }
-    - if can?(current_user, :admin_list, @project)
+    - if can?(current_user, :admin_list, current_board_parent)
       %board-blank-state{ "v-if" => 'list.id == "blank"' }
diff --git a/app/views/shared/boards/components/_sidebar.html.haml b/app/views/shared/boards/components/_sidebar.html.haml
index ba5f681c804..b3f73e96b81 100644
--- a/app/views/shared/boards/components/_sidebar.html.haml
+++ b/app/views/shared/boards/components/_sidebar.html.haml
@@ -10,7 +10,7 @@
             %br/
             %span
               = precede "#" do
-                {{ issue.id }}
+                {{ issue.iid }}
           %a.gutter-toggle.pull-right{ role: "button",
             href: "#",
             "@click.prevent" => "closeSidebar",
@@ -23,5 +23,6 @@
           = render "shared/boards/components/sidebar/labels"
           = render "shared/boards/components/sidebar/notifications"
           %remove-btn{ ":issue" => "issue",
+            ":issue-update" => "'#{build_issue_link_base}/' + issue.iid + '.json'",
             ":list" => "list",
             "v-if" => "canRemove" }
diff --git a/app/views/shared/boards/components/sidebar/_assignee.html.haml b/app/views/shared/boards/components/sidebar/_assignee.html.haml
index 8d957613be1..3d2e8471a60 100644
--- a/app/views/shared/boards/components/sidebar/_assignee.html.haml
+++ b/app/views/shared/boards/components/sidebar/_assignee.html.haml
@@ -2,13 +2,13 @@
   %template{ "v-if" => "issue.assignees" }
     %assignee-title{ ":number-of-assignees" => "issue.assignees.length",
       ":loading" => "loadingAssignees",
-      ":editable" => can?(current_user, :admin_issue, @project) }
+      ":editable" => can_admin_issue? }
     %assignees.value{ "root-path" => "#{root_url}",
       ":users" => "issue.assignees",
-      ":editable" => can?(current_user, :admin_issue, @project),
+      ":editable" => can_admin_issue?,
       "@assign-self" => "assignSelf" }
 
-  - if can?(current_user, :admin_issue, @project)
+  - if can_admin_issue?
     .selectbox.hide-collapsed
       %input.js-vue{ type: "hidden",
         name: "issue[assignee_ids][]",
@@ -20,9 +20,9 @@
         ":data-username" => "assignee.username" }
       .dropdown
         - dropdown_options = issue_assignees_dropdown_options
-        %button.dropdown-menu-toggle.js-user-search.js-author-search.js-multiselect.js-save-user-data.js-issue-board-sidebar{ type: 'button', ref: 'assigneeDropdown', data: { toggle: 'dropdown', field_name: 'issue[assignee_ids][]', first_user: current_user&.username, current_user: 'true', project_id: @project.id, null_user: 'true', multi_select: 'true', 'dropdown-header': dropdown_options[:data][:'dropdown-header'], 'max-select': dropdown_options[:data][:'max-select'] },
-          ":data-issuable-id" => "issue.id",
-          ":data-issue-update" => "'#{project_issues_path(@project)}/' + issue.id + '.json'" }
+        %button.dropdown-menu-toggle.js-user-search.js-author-search.js-multiselect.js-save-user-data.js-issue-board-sidebar{ type: 'button', ref: 'assigneeDropdown', data: board_sidebar_user_data,
+          ":data-issuable-id" => "issue.iid",
+          ":data-issue-update" => "'#{build_issue_link_base}/' + issue.iid + '.json'" }
           = dropdown_options[:title]
           = icon("chevron-down")
         .dropdown-menu.dropdown-select.dropdown-menu-user.dropdown-menu-selectable.dropdown-menu-author
diff --git a/app/views/shared/boards/components/sidebar/_due_date.html.haml b/app/views/shared/boards/components/sidebar/_due_date.html.haml
index e8394eab213..db794d6f855 100644
--- a/app/views/shared/boards/components/sidebar/_due_date.html.haml
+++ b/app/views/shared/boards/components/sidebar/_due_date.html.haml
@@ -1,7 +1,7 @@
 .block.due_date
   .title
     Due date
-    - if can?(current_user, :admin_issue, @project)
+    - if can_admin_issue?
       = icon("spinner spin", class: "block-loading")
       = link_to "Edit", "#", class: "js-sidebar-dropdown-toggle edit-link pull-right"
   .value
@@ -10,12 +10,12 @@
         No due date
       %span.bold{ "v-if" => "issue.dueDate" }
         {{ issue.dueDate | due-date }}
-      - if can?(current_user, :admin_issue, @project)
+      - if can_admin_issue?
         %span.no-value.js-remove-due-date-holder{ "v-if" => "issue.dueDate" }
           \-
           %a.js-remove-due-date{ href: "#", role: "button" }
             remove due date
-  - if can?(current_user, :admin_issue, @project)
+  - if can_admin_issue?
     .selectbox
       %input{ type: "hidden",
         name: "issue[due_date]",
@@ -23,7 +23,7 @@
       .dropdown
         %button.dropdown-menu-toggle.js-due-date-select.js-issue-boards-due-date{ type: 'button',
           data: { toggle: 'dropdown', field_name: "issue[due_date]", ability_name: "issue" },
-          ":data-issue-update" => "'#{project_issues_path(@project)}/' + issue.id + '.json'" }
+          ":data-issue-update" => "'#{build_issue_link_base}/' + issue.iid + '.json'" }
           %span.dropdown-toggle-text Due date
           = icon('chevron-down')
         .dropdown-menu.dropdown-menu-due-date
diff --git a/app/views/shared/boards/components/sidebar/_labels.html.haml b/app/views/shared/boards/components/sidebar/_labels.html.haml
index 6b389736e8b..1f540bdaf93 100644
--- a/app/views/shared/boards/components/sidebar/_labels.html.haml
+++ b/app/views/shared/boards/components/sidebar/_labels.html.haml
@@ -1,7 +1,7 @@
 .block.labels
   .title
     Labels
-    - if can?(current_user, :admin_issue, @project)
+    - if can_admin_issue?
       = icon("spinner spin", class: "block-loading")
       = link_to "Edit", "#", class: "js-sidebar-dropdown-toggle edit-link pull-right"
   .value.issuable-show-labels
@@ -11,7 +11,7 @@
       "v-for" => "label in issue.labels" }
       %span.label.color-label.has-tooltip{ ":style" => "{ backgroundColor: label.color, color: label.textColor }" }
         {{ label.title }}
-  - if can?(current_user, :admin_issue, @project)
+  - if can_admin_issue?
     .selectbox
       %input{ type: "hidden",
         name: "issue[label_names][]",
@@ -19,12 +19,19 @@
         ":value" => "label.id" }
       .dropdown
         %button.dropdown-menu-toggle.js-label-select.js-multiselect.js-issue-board-sidebar{ type: "button",
-          data: { toggle: "dropdown", field_name: "issue[label_names][]", show_no: "true", show_any: "true", project_id: @project.id, labels: project_labels_path(@project, :json), namespace_path: @project.try(:namespace).try(:full_path), project_path: @project.try(:path) },
-          ":data-issue-update" => "'#{project_issues_path(@project)}/' + issue.id + '.json'" }
+          data: { toggle: "dropdown",
+            field_name: "issue[label_names][]",
+            show_no: "true",
+            show_any: "true",
+            project_id: @project&.try(:id),
+            labels: labels_filter_path(false),
+            namespace_path: @project.try(:namespace).try(:full_path),
+            project_path: @project.try(:path) },
+          ":data-issue-update" => "'#{build_issue_link_base}/' + issue.iid + '.json'" }
           %span.dropdown-toggle-text
             Label
           = icon('chevron-down')
         .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
           = render partial: "shared/issuable/label_page_default"
-          - if can? current_user, :admin_label, @project and @project
+          - if can?(current_user, :admin_label, current_board_parent)
             = render partial: "shared/issuable/label_page_create"
diff --git a/app/views/shared/boards/components/sidebar/_milestone.html.haml b/app/views/shared/boards/components/sidebar/_milestone.html.haml
index a1ddb261ea3..d09c7c218e0 100644
--- a/app/views/shared/boards/components/sidebar/_milestone.html.haml
+++ b/app/views/shared/boards/components/sidebar/_milestone.html.haml
@@ -1,7 +1,7 @@
 .block.milestone
   .title
     Milestone
-    - if can?(current_user, :admin_issue, @project)
+    - if can_admin_issue?
       = icon("spinner spin", class: "block-loading")
       = link_to "Edit", "#", class: "js-sidebar-dropdown-toggle edit-link pull-right"
   .value
@@ -9,17 +9,17 @@
       None
     %span.bold.has-tooltip{ "v-if" => "issue.milestone" }
       {{ issue.milestone.title }}
-  - if can?(current_user, :admin_issue, @project)
+  - if can_admin_issue?
     .selectbox
       %input{ type: "hidden",
         ":value" => "issue.milestone.id",
         name: "issue[milestone_id]",
         "v-if" => "issue.milestone" }
       .dropdown
-        %button.dropdown-menu-toggle.js-milestone-select.js-issue-board-sidebar{ type: "button", data: { toggle: "dropdown", show_no: "true", field_name: "issue[milestone_id]", project_id: @project.id, milestones: project_milestones_path(@project, :json), ability_name: "issue", use_id: "true", default_no: "true" },
+        %button.dropdown-menu-toggle.js-milestone-select.js-issue-board-sidebar{ type: "button", data: { toggle: "dropdown", show_no: "true", field_name: "issue[milestone_id]", milestones: milestones_filter_path(format: :json), ability_name: "issue", use_id: "true", default_no: "true" },
           ":data-selected" => "milestoneTitle",
-          ":data-issuable-id" => "issue.id",
-          ":data-issue-update" => "'#{project_issues_path(@project)}/' + issue.id + '.json'" }
+          ":data-issuable-id" => "issue.iid",
+          ":data-issue-update" => "'#{build_issue_link_base}/' + issue.iid + '.json'" }
           Milestone
           = icon("chevron-down")
         .dropdown-menu.dropdown-select.dropdown-menu-selectable
diff --git a/app/views/shared/boards/components/sidebar/_notifications.html.haml b/app/views/shared/boards/components/sidebar/_notifications.html.haml
index aaddd7e249f..9b989c23cab 100644
--- a/app/views/shared/boards/components/sidebar/_notifications.html.haml
+++ b/app/views/shared/boards/components/sidebar/_notifications.html.haml
@@ -1,5 +1,5 @@
 - if current_user
-  .block.light.subscription{ ":data-url" => "'#{project_issues_path(@project)}/' + issue.id + '/toggle_subscription'" }
+  .block.light.subscription{ ":data-url" => "'#{build_issue_link_base}/' + issue.iid + '/toggle_subscription'" }
     %span.issuable-header-text.hide-collapsed.pull-left
       Notifications
     %button.btn.btn-default.pull-right.js-subscribe-button.issuable-subscribe-button.hide-collapsed{ type: "button" }
diff --git a/app/views/shared/issuable/_label_page_default.html.haml b/app/views/shared/issuable/_label_page_default.html.haml
index e8feff32d26..ad031e6af80 100644
--- a/app/views/shared/issuable/_label_page_default.html.haml
+++ b/app/views/shared/issuable/_label_page_default.html.haml
@@ -8,20 +8,19 @@
   - if show_boards_content
     .issue-board-dropdown-content
       %p
-        Create lists from the labels you use in your project. Issues with that
-        label will automatically be added to the list.
+        Create lists from labels. Issues with that label appear in that list.
   = dropdown_filter(filter_placeholder)
   = dropdown_content
-  - if @project && show_footer
+  - if current_board_parent && show_footer
     = dropdown_footer do
       %ul.dropdown-footer-list
-        - if can?(current_user, :admin_label, @project)
+        - if can?(current_user, :admin_label, current_board_parent)
           %li
             %a.dropdown-toggle-page{ href: "#" }
               Create new label
         %li
-          = link_to project_labels_path(@project), :"data-is-link" => true do
-            - if show_create && @project && can?(current_user, :admin_label, @project)
+          = link_to labels_path, :"data-is-link" => true do
+            - if show_create && can?(current_user, :admin_label, current_board_parent)
               Manage labels
             - else
               View labels
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml
index e81789ea7a2..161b1c9fd72 100644
--- a/app/views/shared/issuable/_search_bar.html.haml
+++ b/app/views/shared/issuable/_search_bar.html.haml
@@ -104,13 +104,13 @@
             = icon('times')
         .filter-dropdown-container
           - if type == :boards
-            - if can?(current_user, :admin_list, @project)
+            - if can?(current_user, :admin_list, board.parent)
               .dropdown.prepend-left-10#js-add-list
-                %button.btn.btn-create.btn-inverted.js-new-board-list{ type: "button", data: { toggle: "dropdown", labels: labels_filter_path, namespace_path: @project.try(:namespace).try(:full_path), project_path: @project.try(:path) } }
+                %button.btn.btn-create.btn-inverted.js-new-board-list{ type: "button", data: board_list_data }
                   Add list
                 .dropdown-menu.dropdown-menu-paging.dropdown-menu-align-right.dropdown-menu-issues-board-new.dropdown-menu-selectable
                   = render partial: "shared/issuable/label_page_default", locals: { show_footer: true, show_create: true, show_boards_content: true, title: "Add list" }
-                  - if can?(current_user, :admin_label, @project)
+                  - if can?(current_user, :admin_label, board.parent)
                     = render partial: "shared/issuable/label_page_create"
                   = dropdown_loading
               #js-add-issues-btn.prepend-left-10