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
4652b08f
Commit
4652b08f
authored
Jan 31, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hardcoded author, assignee & milestone dropdowns
parent
9e433536
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
120 additions
and
8 deletions
+120
-8
app/assets/javascripts/boards/components/modal/filters.js.es6
...assets/javascripts/boards/components/modal/filters.js.es6
+96
-3
app/assets/javascripts/boards/components/modal/index.js.es6
app/assets/javascripts/boards/components/modal/index.js.es6
+11
-2
app/assets/javascripts/boards/stores/modal_store.js.es6
app/assets/javascripts/boards/stores/modal_store.js.es6
+5
-0
app/assets/javascripts/milestone_select.js
app/assets/javascripts/milestone_select.js
+3
-1
app/assets/javascripts/users_select.js
app/assets/javascripts/users_select.js
+3
-1
app/views/projects/boards/_show.html.haml
app/views/projects/boards/_show.html.haml
+2
-1
No files found.
app/assets/javascripts/boards/components/modal/filters.js.es6
View file @
4652b08f
/* global Vue */
/* global Vue */
/* global UsersSelect */
/* global MilestoneSelect */
(() => {
(() => {
const ModalStore = gl.issueBoards.ModalStore;
const ModalStore = gl.issueBoards.ModalStore;
gl.issueBoards.ModalFilters = Vue.extend({
gl.issueBoards.ModalFilters = Vue.extend({
computed: {
currentUsername() {
return gon.current_username;
},
},
mounted() {
new UsersSelect();
new MilestoneSelect();
},
template: `
template: `
<div class="modal-filters">
<div class="modal-filters">
<div class="dropdown">
<div class="dropdown">
<button
<button
class="dropdown-menu-toggle js-user-search js-author-search"
class="dropdown-menu-toggle js-user-search js-author-search"
type="button"
type="button"
data-toggle="dropdown">
data-toggle="dropdown"
data-any-user="Any Author"
data-current-user="true"
data-field-name="author_id"
:data-project-id="12"
:data-first-user="currentUsername">
Author
Author
<i class="fa fa-chevron-down"></i>
<i class="fa fa-chevron-down"></i>
</button>
</button>
<div class="dropdown-menu dropdown-select dropdown-menu-user dropdown-menu-selectable dropdown-menu-author">
<div class="dropdown-title">
<span>Filter by author</span>
<button
class="dropdown-title-button dropdown-menu-close"
aria-label="Close"
type="button">
<i class="fa fa-times dropdown-menu-close-icon"></i>
</button>
</div>
<div class="dropdown-input">
<input
type="search"
class="dropdown-input-field"
placeholder="Search authors"
autocomplete="off" />
<i class="fa fa-search dropdown-input-search"></i>
<i role="button" class="fa fa-times dropdown-input-clear js-dropdown-input-clear"></i>
</div>
<div class="dropdown-content"></div>
<div class="dropdown-loading"><i class="fa fa-spinner fa-spin"></i></div>
</div>
</div>
</div>
<div class="dropdown">
<div class="dropdown">
<button
<button
class="dropdown-menu-toggle js-user-search js-assignee-search"
class="dropdown-menu-toggle js-user-search js-assignee-search"
type="button"
type="button"
data-toggle="dropdown">
data-toggle="dropdown"
data-any-user="Any Assignee"
data-null-user="true"
data-current-user="true"
data-field-name="assignee_id"
:data-project-id="12"
:data-first-user="currentUsername">
Assignee
Assignee
<i class="fa fa-chevron-down"></i>
<i class="fa fa-chevron-down"></i>
</button>
</button>
<div class="dropdown-menu dropdown-select dropdown-menu-user dropdown-menu-selectable dropdown-menu-author">
<div class="dropdown-title">
<span>Filter by assignee</span>
<button
class="dropdown-title-button dropdown-menu-close"
aria-label="Close"
type="button">
<i class="fa fa-times dropdown-menu-close-icon"></i>
</button>
</div>
<div class="dropdown-input">
<input
type="search"
class="dropdown-input-field"
placeholder="Search assignee"
autocomplete="off" />
<i class="fa fa-search dropdown-input-search"></i>
<i role="button" class="fa fa-times dropdown-input-clear js-dropdown-input-clear"></i>
</div>
<div class="dropdown-content"></div>
<div class="dropdown-loading"><i class="fa fa-spinner fa-spin"></i></div>
</div>
</div>
</div>
<div class="dropdown">
<div class="dropdown">
<button
<button
class="dropdown-menu-toggle js-milestone-select"
class="dropdown-menu-toggle js-milestone-select"
type="button"
type="button"
data-toggle="dropdown">
data-toggle="dropdown"
data-show-any="true"
data-show-upcoming="true"
data-field-name="milestone_title"
:data-project-id="12"
:data-milestones="'/root/test/milestones.json'">
Milestone
Milestone
<i class="fa fa-chevron-down"></i>
<i class="fa fa-chevron-down"></i>
</button>
</button>
<div class="dropdown-menu dropdown-select dropdown-menu-selectable dropdown-menu-milestone">
<div class="dropdown-title">
<span>Filter by milestone</span>
<button
class="dropdown-title-button dropdown-menu-close"
aria-label="Close"
type="button">
<i class="fa fa-times dropdown-menu-close-icon"></i>
</button>
</div>
<div class="dropdown-input">
<input
type="search"
class="dropdown-input-field"
placeholder="Search milestones"
autocomplete="off" />
<i class="fa fa-search dropdown-input-search"></i>
<i role="button" class="fa fa-times dropdown-input-clear js-dropdown-input-clear"></i>
</div>
<div class="dropdown-content"></div>
<div class="dropdown-loading"><i class="fa fa-spinner fa-spin"></i></div>
</div>
</div>
</div>
<div class="dropdown">
<div class="dropdown">
<button
<button
...
...
app/assets/javascripts/boards/components/modal/index.js.es6
View file @
4652b08f
...
@@ -50,17 +50,26 @@
...
@@ -50,17 +50,26 @@
this.issuesCount = false;
this.issuesCount = false;
}
}
},
},
filter: {
handler() {
this.issues = [];
this.loadIssues();
},
deep: true,
}
},
},
methods: {
methods: {
searchOperation: _.debounce(function searchOperationDebounce() {
searchOperation: _.debounce(function searchOperationDebounce() {
this.loadIssues(true);
this.loadIssues(true);
}, 500),
}, 500),
loadIssues(clearIssues = false) {
loadIssues(clearIssues = false) {
return gl.boardService.getBacklog(
{
const data = Object.assign({}, this.filter,
{
search: this.searchTerm,
search: this.searchTerm,
page: this.page,
page: this.page,
per: this.perPage,
per: this.perPage,
}).then((res) => {
});
return gl.boardService.getBacklog(data).then((res) => {
const data = res.json();
const data = res.json();
if (clearIssues) {
if (clearIssues) {
...
...
app/assets/javascripts/boards/stores/modal_store.js.es6
View file @
4652b08f
...
@@ -17,6 +17,11 @@
...
@@ -17,6 +17,11 @@
loadingNewPage: false,
loadingNewPage: false,
page: 1,
page: 1,
perPage: 50,
perPage: 50,
filter: {
author_id: '',
assignee_id: '',
milestone_title: '',
},
};
};
}
}
...
...
app/assets/javascripts/milestone_select.js
View file @
4652b08f
...
@@ -116,7 +116,9 @@
...
@@ -116,7 +116,9 @@
e
.
preventDefault
();
e
.
preventDefault
();
return
;
return
;
}
}
if
(
$
(
'
html
'
).
hasClass
(
'
issue-boards-page
'
)
&&
!
$dropdown
.
hasClass
(
'
js-issue-board-sidebar
'
))
{
if
(
$el
.
closest
(
'
.add-issues-modal
'
).
length
)
{
gl
.
issueBoards
.
ModalStore
.
store
.
filter
[
$dropdown
.
data
(
'
field-name
'
)]
=
selected
.
name
;
}
else
if
(
$
(
'
html
'
).
hasClass
(
'
issue-boards-page
'
)
&&
!
$dropdown
.
hasClass
(
'
js-issue-board-sidebar
'
))
{
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
$dropdown
.
data
(
'
field-name
'
)]
=
selected
.
name
;
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
$dropdown
.
data
(
'
field-name
'
)]
=
selected
.
name
;
gl
.
issueBoards
.
BoardsStore
.
updateFiltersUrl
();
gl
.
issueBoards
.
BoardsStore
.
updateFiltersUrl
();
e
.
preventDefault
();
e
.
preventDefault
();
...
...
app/assets/javascripts/users_select.js
View file @
4652b08f
...
@@ -193,7 +193,9 @@
...
@@ -193,7 +193,9 @@
selectedId
=
user
.
id
;
selectedId
=
user
.
id
;
return
;
return
;
}
}
if
(
$
(
'
html
'
).
hasClass
(
'
issue-boards-page
'
)
&&
!
$dropdown
.
hasClass
(
'
js-issue-board-sidebar
'
))
{
if
(
$el
.
closest
(
'
.add-issues-modal
'
).
length
)
{
gl
.
issueBoards
.
ModalStore
.
store
.
filter
[
$dropdown
.
data
(
'
field-name
'
)]
=
user
.
id
;
}
else
if
(
$
(
'
html
'
).
hasClass
(
'
issue-boards-page
'
)
&&
!
$dropdown
.
hasClass
(
'
js-issue-board-sidebar
'
))
{
selectedId
=
user
.
id
;
selectedId
=
user
.
id
;
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
$dropdown
.
data
(
'
field-name
'
)]
=
user
.
id
;
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
$dropdown
.
data
(
'
field-name
'
)]
=
user
.
id
;
gl
.
issueBoards
.
BoardsStore
.
updateFiltersUrl
();
gl
.
issueBoards
.
BoardsStore
.
updateFiltersUrl
();
...
...
app/views/projects/boards/_show.html.haml
View file @
4652b08f
...
@@ -30,4 +30,5 @@
...
@@ -30,4 +30,5 @@
%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
),
":issue-link-base"
=>
"issueLinkBase"
,
":issue-link-base"
=>
"issueLinkBase"
,
":root-path"
=>
"rootPath"
}
":root-path"
=>
"rootPath"
,
":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