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
b80403a3
Commit
b80403a3
authored
Sep 28, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add weight param to filter bar
parent
4d2315a3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
2 deletions
+17
-2
app/assets/javascripts/boards/boards_bundle.js
app/assets/javascripts/boards/boards_bundle.js
+16
-2
ee/app/helpers/ee/boards_helper.rb
ee/app/helpers/ee/boards_helper.rb
+1
-0
No files found.
app/assets/javascripts/boards/boards_bundle.js
View file @
b80403a3
...
@@ -69,6 +69,7 @@ $(() => {
...
@@ -69,6 +69,7 @@ $(() => {
bulkUpdatePath
:
$boardApp
.
dataset
.
bulkUpdatePath
,
bulkUpdatePath
:
$boardApp
.
dataset
.
bulkUpdatePath
,
detailIssue
:
Store
.
detail
,
detailIssue
:
Store
.
detail
,
milestoneTitle
:
$boardApp
.
dataset
.
boardMilestoneTitle
,
milestoneTitle
:
$boardApp
.
dataset
.
boardMilestoneTitle
,
weight
:
$boardApp
.
dataset
.
boardWeight
,
defaultAvatar
:
$boardApp
.
dataset
.
defaultAvatar
,
defaultAvatar
:
$boardApp
.
dataset
.
defaultAvatar
,
},
},
computed
:
{
computed
:
{
...
@@ -77,6 +78,7 @@ $(() => {
...
@@ -77,6 +78,7 @@ $(() => {
},
},
},
},
created
()
{
created
()
{
const
cantEdit
=
[];
if
(
this
.
milestoneTitle
)
{
if
(
this
.
milestoneTitle
)
{
const
milestoneTitleParam
=
`milestone_title=
${
this
.
milestoneTitle
}
`
;
const
milestoneTitleParam
=
`milestone_title=
${
this
.
milestoneTitle
}
`
;
...
@@ -84,9 +86,21 @@ $(() => {
...
@@ -84,9 +86,21 @@ $(() => {
Store
.
filter
.
path
.
split
(
'
&
'
).
filter
(
param
=>
param
.
match
(
/^milestone_title=
(
.*
)
$/g
)
===
null
)
Store
.
filter
.
path
.
split
(
'
&
'
).
filter
(
param
=>
param
.
match
(
/^milestone_title=
(
.*
)
$/g
)
===
null
)
).
join
(
'
&
'
);
).
join
(
'
&
'
);
Store
.
updateFiltersUrl
(
true
);
cantEdit
.
push
(
'
milestone
'
);
}
if
(
this
.
weight
)
{
const
weightParam
=
`weight=
${
this
.
weight
}
`
;
Store
.
filter
.
path
=
[
weightParam
].
concat
(
Store
.
filter
.
path
.
split
(
'
&
'
).
filter
(
param
=>
param
.
match
(
/^weight=
(
.*
)
$/g
)
===
null
)
).
join
(
'
&
'
);
cantEdit
.
push
(
'
weight
'
);
}
}
Store
.
updateFiltersUrl
(
true
);
gl
.
boardService
=
new
BoardService
({
gl
.
boardService
=
new
BoardService
({
boardsEndpoint
:
this
.
boardsEndpoint
,
boardsEndpoint
:
this
.
boardsEndpoint
,
listsEndpoint
:
this
.
listsEndpoint
,
listsEndpoint
:
this
.
listsEndpoint
,
...
@@ -95,7 +109,7 @@ $(() => {
...
@@ -95,7 +109,7 @@ $(() => {
});
});
Store
.
rootPath
=
this
.
boardsEndpoint
;
Store
.
rootPath
=
this
.
boardsEndpoint
;
this
.
filterManager
=
new
FilteredSearchBoards
(
Store
.
filter
,
true
,
[(
this
.
milestoneTitle
?
'
milestone
'
:
null
)]
);
this
.
filterManager
=
new
FilteredSearchBoards
(
Store
.
filter
,
true
,
cantEdit
);
this
.
filterManager
.
setup
();
this
.
filterManager
.
setup
();
// Listen for updateTokens event
// Listen for updateTokens event
...
...
ee/app/helpers/ee/boards_helper.rb
View file @
b80403a3
...
@@ -7,6 +7,7 @@ module EE
...
@@ -7,6 +7,7 @@ module EE
def
board_data
def
board_data
data
=
{
data
=
{
board_milestone_title:
board
&
.
milestone
&
.
title
,
board_milestone_title:
board
&
.
milestone
&
.
title
,
board_weight:
board
&
.
weight
,
focus_mode_available:
parent
.
feature_available?
(
:issue_board_focus_mode
).
to_s
,
focus_mode_available:
parent
.
feature_available?
(
:issue_board_focus_mode
).
to_s
,
show_promotion:
(
@project
&&
show_promotions?
&&
(
!
@project
.
feature_available?
(
:multiple_issue_boards
)
||
!
@project
.
feature_available?
(
:scoped_issue_board
)
||
!
@project
.
feature_available?
(
:issue_board_focus_mode
))).
to_s
show_promotion:
(
@project
&&
show_promotions?
&&
(
!
@project
.
feature_available?
(
:multiple_issue_boards
)
||
!
@project
.
feature_available?
(
:scoped_issue_board
)
||
!
@project
.
feature_available?
(
:issue_board_focus_mode
))).
to_s
...
...
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