Passes through the correct endpoints
This commit is contained in:
parent
b934a123fb
commit
10f805c2dc
6 changed files with 48 additions and 6 deletions
|
@ -9,6 +9,14 @@
|
|||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
milestonePath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
labelPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
components: {
|
||||
'user-filter': gl.issueBoards.ModalFilterUser,
|
||||
|
@ -30,8 +38,8 @@
|
|||
field-name="assignee_id"
|
||||
:null-user="true"
|
||||
:project-id="projectId"></user-filter>
|
||||
<milestone-filter></milestone-filter>
|
||||
<label-filter></label-filter>
|
||||
<milestone-filter :milestone-path="milestonePath"></milestone-filter>
|
||||
<label-filter :label-path="labelPath"></label-filter>
|
||||
</div>
|
||||
`,
|
||||
});
|
||||
|
|
|
@ -2,6 +2,12 @@
|
|||
/* global LabelSelect */
|
||||
(() => {
|
||||
gl.issueBoards.ModalLabelFilter = Vue.extend({
|
||||
props: {
|
||||
labelPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
new LabelsSelect(this.$refs.dropdown);
|
||||
},
|
||||
|
@ -11,9 +17,9 @@
|
|||
class="dropdown-menu-toggle js-label-select js-multiselect js-extra-options"
|
||||
type="button"
|
||||
data-toggle="dropdown"
|
||||
data-labels="/root/test/labels.json"
|
||||
data-show-any="true"
|
||||
data-show-no="true"
|
||||
:data-labels="labelPath"
|
||||
ref="dropdown">
|
||||
<span class="dropdown-toggle-text">
|
||||
Label
|
||||
|
|
|
@ -2,6 +2,12 @@
|
|||
/* global MilestoneSelect */
|
||||
(() => {
|
||||
gl.issueBoards.ModalFilterMilestone = Vue.extend({
|
||||
props: {
|
||||
milestonePath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
new MilestoneSelect(null, this.$refs.dropdown);
|
||||
},
|
||||
|
@ -14,7 +20,7 @@
|
|||
data-show-any="true"
|
||||
data-show-upcoming="true"
|
||||
data-field-name="milestone_title"
|
||||
:data-milestones="'/root/test/milestones.json'"
|
||||
:data-milestones="milestonePath"
|
||||
ref="dropdown">
|
||||
<span class="dropdown-toggle-text">
|
||||
Milestone
|
||||
|
|
|
@ -11,6 +11,14 @@
|
|||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
milestonePath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
labelPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return ModalStore.store;
|
||||
|
@ -58,7 +66,9 @@
|
|||
class="add-issues-search append-bottom-10"
|
||||
v-if="showSearch">
|
||||
<modal-filters
|
||||
:project-id="projectId">
|
||||
:project-id="projectId"
|
||||
:milestone-path="milestonePath"
|
||||
:label-path="labelPath">
|
||||
</modal-filters>
|
||||
<input
|
||||
placeholder="Search issues..."
|
||||
|
|
|
@ -29,6 +29,14 @@
|
|||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
milestonePath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
labelPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return ModalStore.store;
|
||||
|
@ -123,7 +131,9 @@
|
|||
v-if="showAddIssuesModal">
|
||||
<div class="add-issues-container">
|
||||
<modal-header
|
||||
:project-id="projectId">
|
||||
:project-id="projectId"
|
||||
:milestone-path="milestonePath"
|
||||
:label-path="labelPath">
|
||||
</modal-header>
|
||||
<modal-list
|
||||
:issue-link-base="issueLinkBase"
|
||||
|
|
|
@ -29,6 +29,8 @@
|
|||
= render "projects/boards/components/sidebar"
|
||||
%board-add-issues-modal{ "blank-state-image" => render('shared/empty_states/icons/issues.svg'),
|
||||
"new-issue-path" => new_namespace_project_issue_path(@project.namespace, @project),
|
||||
"milestone-path" => milestones_filter_dropdown_path,
|
||||
"label-path" => labels_filter_path,
|
||||
":issue-link-base" => "issueLinkBase",
|
||||
":root-path" => "rootPath",
|
||||
":project-id" => @project.try(:id) }
|
||||
|
|
Loading…
Reference in a new issue