Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
10f805c2
Commit
10f805c2
authored
Feb 01, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Passes through the correct endpoints
parent
b934a123
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
48 additions
and
6 deletions
+48
-6
app/assets/javascripts/boards/components/modal/filters.js.es6
...assets/javascripts/boards/components/modal/filters.js.es6
+10
-2
app/assets/javascripts/boards/components/modal/filters/label.js.es6
.../javascripts/boards/components/modal/filters/label.js.es6
+7
-1
app/assets/javascripts/boards/components/modal/filters/milestone.js.es6
...ascripts/boards/components/modal/filters/milestone.js.es6
+7
-1
app/assets/javascripts/boards/components/modal/header.js.es6
app/assets/javascripts/boards/components/modal/header.js.es6
+11
-1
app/assets/javascripts/boards/components/modal/index.js.es6
app/assets/javascripts/boards/components/modal/index.js.es6
+11
-1
app/views/projects/boards/_show.html.haml
app/views/projects/boards/_show.html.haml
+2
-0
No files found.
app/assets/javascripts/boards/components/modal/filters.js.es6
View file @
10f805c2
...
@@ -9,6 +9,14 @@
...
@@ -9,6 +9,14 @@
type: Number,
type: Number,
required: true,
required: true,
},
},
milestonePath: {
type: String,
required: true,
},
labelPath: {
type: String,
required: true,
},
},
},
components: {
components: {
'user-filter': gl.issueBoards.ModalFilterUser,
'user-filter': gl.issueBoards.ModalFilterUser,
...
@@ -30,8 +38,8 @@
...
@@ -30,8 +38,8 @@
field-name="assignee_id"
field-name="assignee_id"
:null-user="true"
:null-user="true"
:project-id="projectId"></user-filter>
:project-id="projectId"></user-filter>
<milestone-filter></milestone-filter>
<milestone-filter
:milestone-path="milestonePath"
></milestone-filter>
<label-filter></label-filter>
<label-filter
:label-path="labelPath"
></label-filter>
</div>
</div>
`,
`,
});
});
...
...
app/assets/javascripts/boards/components/modal/filters/label.js.es6
View file @
10f805c2
...
@@ -2,6 +2,12 @@
...
@@ -2,6 +2,12 @@
/* global LabelSelect */
/* global LabelSelect */
(() => {
(() => {
gl.issueBoards.ModalLabelFilter = Vue.extend({
gl.issueBoards.ModalLabelFilter = Vue.extend({
props: {
labelPath: {
type: String,
required: true,
},
},
mounted() {
mounted() {
new LabelsSelect(this.$refs.dropdown);
new LabelsSelect(this.$refs.dropdown);
},
},
...
@@ -11,9 +17,9 @@
...
@@ -11,9 +17,9 @@
class="dropdown-menu-toggle js-label-select js-multiselect js-extra-options"
class="dropdown-menu-toggle js-label-select js-multiselect js-extra-options"
type="button"
type="button"
data-toggle="dropdown"
data-toggle="dropdown"
data-labels="/root/test/labels.json"
data-show-any="true"
data-show-any="true"
data-show-no="true"
data-show-no="true"
:data-labels="labelPath"
ref="dropdown">
ref="dropdown">
<span class="dropdown-toggle-text">
<span class="dropdown-toggle-text">
Label
Label
...
...
app/assets/javascripts/boards/components/modal/filters/milestone.js.es6
View file @
10f805c2
...
@@ -2,6 +2,12 @@
...
@@ -2,6 +2,12 @@
/* global MilestoneSelect */
/* global MilestoneSelect */
(() => {
(() => {
gl.issueBoards.ModalFilterMilestone = Vue.extend({
gl.issueBoards.ModalFilterMilestone = Vue.extend({
props: {
milestonePath: {
type: String,
required: true,
},
},
mounted() {
mounted() {
new MilestoneSelect(null, this.$refs.dropdown);
new MilestoneSelect(null, this.$refs.dropdown);
},
},
...
@@ -14,7 +20,7 @@
...
@@ -14,7 +20,7 @@
data-show-any="true"
data-show-any="true"
data-show-upcoming="true"
data-show-upcoming="true"
data-field-name="milestone_title"
data-field-name="milestone_title"
:data-milestones="
'/root/test/milestones.json'
"
:data-milestones="
milestonePath
"
ref="dropdown">
ref="dropdown">
<span class="dropdown-toggle-text">
<span class="dropdown-toggle-text">
Milestone
Milestone
...
...
app/assets/javascripts/boards/components/modal/header.js.es6
View file @
10f805c2
...
@@ -11,6 +11,14 @@
...
@@ -11,6 +11,14 @@
type: Number,
type: Number,
required: true,
required: true,
},
},
milestonePath: {
type: String,
required: true,
},
labelPath: {
type: String,
required: true,
},
},
},
data() {
data() {
return ModalStore.store;
return ModalStore.store;
...
@@ -58,7 +66,9 @@
...
@@ -58,7 +66,9 @@
class="add-issues-search append-bottom-10"
class="add-issues-search append-bottom-10"
v-if="showSearch">
v-if="showSearch">
<modal-filters
<modal-filters
:project-id="projectId">
:project-id="projectId"
:milestone-path="milestonePath"
:label-path="labelPath">
</modal-filters>
</modal-filters>
<input
<input
placeholder="Search issues..."
placeholder="Search issues..."
...
...
app/assets/javascripts/boards/components/modal/index.js.es6
View file @
10f805c2
...
@@ -29,6 +29,14 @@
...
@@ -29,6 +29,14 @@
type: Number,
type: Number,
required: true,
required: true,
},
},
milestonePath: {
type: String,
required: true,
},
labelPath: {
type: String,
required: true,
},
},
},
data() {
data() {
return ModalStore.store;
return ModalStore.store;
...
@@ -123,7 +131,9 @@
...
@@ -123,7 +131,9 @@
v-if="showAddIssuesModal">
v-if="showAddIssuesModal">
<div class="add-issues-container">
<div class="add-issues-container">
<modal-header
<modal-header
:project-id="projectId">
:project-id="projectId"
:milestone-path="milestonePath"
:label-path="labelPath">
</modal-header>
</modal-header>
<modal-list
<modal-list
:issue-link-base="issueLinkBase"
:issue-link-base="issueLinkBase"
...
...
app/views/projects/boards/_show.html.haml
View file @
10f805c2
...
@@ -29,6 +29,8 @@
...
@@ -29,6 +29,8 @@
=
render
"projects/boards/components/sidebar"
=
render
"projects/boards/components/sidebar"
%board-add-issues-modal
{
"blank-state-image"
=>
render
(
'shared/empty_states/icons/issues.svg'
),
%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
),
"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"
,
":issue-link-base"
=>
"issueLinkBase"
,
":root-path"
=>
"rootPath"
,
":root-path"
=>
"rootPath"
,
":project-id"
=>
@project
.
try
(
:id
)
}
":project-id"
=>
@project
.
try
(
:id
)
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment