From a971880e5f0c97c478a56bb32ba3372524745387 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 18 Mar 2016 13:35:39 -0500
Subject: [PATCH] Fix endpoint
---
app/assets/javascripts/labels_select.js.coffee | 1 +
app/assets/javascripts/users_select.js.coffee | 1 +
app/views/shared/issuable/_sidebar.html.haml | 6 +++---
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 01847ad2c31..78ee0ba467a 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -148,6 +148,7 @@ class @LabelsSelect
$.ajax(
type: 'PUT'
url: issueURL
+ dataType: 'JSON'
data: data
).done (data) ->
$loading.fadeOut()
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee
index d0e408325b4..5fe8f73ce2d 100644
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -94,6 +94,7 @@ class @UsersSelect
.fadeIn()
$.ajax(
type: 'PUT'
+ dataType: 'json'
url: issueURL
data: data
).done (data) ->
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 33361a05a46..d702c8ec1fe 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -2,9 +2,9 @@
.issuable-sidebar
.block.issuable-sidebar-header
- if issuable.to_ability_name == 'merge_request'
- - issuable_url = namespace_project_merge_request_path(@project.namespace, @project, issuable.id, :json)
+ - issuable_url = namespace_project_merge_request_path(@project.namespace, @project, issuable.iid)
- else
- - issuable_url = namespace_project_issue_path(@project.namespace, @project, issuable.id, :json)
+ - issuable_url = namespace_project_issue_path(@project.namespace, @project, issuable.iid)
%span.issuable-count.hide-collapsed.pull-left
= issuable.iid
of
@@ -93,7 +93,7 @@
.light None
.selectbox.hide-collapsed
- issuable.labels.each do |label|
- = hidden_field_tag "{issuable.to_ability_name}[label_names][]", label.id, id: nil
+ = hidden_field_tag "#{issuable.to_ability_name}[label_names][]", label.id, id: nil
.dropdown
%button.dropdown-menu-toggle.js-label-select.js-multiselect{type: "button", data: {toggle: "dropdown", field_name: "#{issuable.to_ability_name}[label_names][]", ability_name: issuable.to_ability_name, show_no: "true", show_any: "true", selected: issuable.label_names.join(","), project_id: (@project.id if @project), issue_update: issuable_url, labels: (namespace_project_labels_path(@project.namespace, @project, :json) if @project)}}
%span.dropdown-toggle-text
--
GitLab