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
4b1b5b0d
Commit
4b1b5b0d
authored
Aug 16, 2018
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix formatting
parent
fe829def
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
21 deletions
+18
-21
app/assets/javascripts/boards/components/modal/index.vue
app/assets/javascripts/boards/components/modal/index.vue
+5
-10
app/assets/javascripts/boards/models/list.js
app/assets/javascripts/boards/models/list.js
+4
-4
app/assets/javascripts/lib/utils/common_utils.js
app/assets/javascripts/lib/utils/common_utils.js
+6
-6
ee/app/assets/javascripts/boards/stores/boards_store_ee.js
ee/app/assets/javascripts/boards/stores/boards_store_ee.js
+3
-1
No files found.
app/assets/javascripts/boards/components/modal/index.vue
View file @
4b1b5b0d
...
...
@@ -109,16 +109,11 @@
loadIssues
(
clearIssues
=
false
)
{
if
(
!
this
.
showAddIssuesModal
)
return
false
;
return
gl
.
boardService
.
getBacklog
(
Object
.
assign
(
urlParamsToObject
(
this
.
filter
.
path
),
{
page
:
this
.
page
,
per
:
this
.
perPage
,
},
),
)
return
gl
.
boardService
.
getBacklog
({
...
urlParamsToObject
(
this
.
filter
.
path
),
page
:
this
.
page
,
per
:
this
.
perPage
,
})
.
then
(
res
=>
res
.
data
)
.
then
(
data
=>
{
if
(
clearIssues
)
{
...
...
app/assets/javascripts/boards/models/list.js
View file @
4b1b5b0d
...
...
@@ -120,10 +120,10 @@ class List {
}
getIssues
(
emptyIssues
=
true
)
{
const
data
=
Object
.
assign
(
urlParamsToObject
(
gl
.
issueBoards
.
BoardsStore
.
filter
.
path
),
{
page
:
this
.
page
}
,
)
;
const
data
=
{
...
urlParamsToObject
(
gl
.
issueBoards
.
BoardsStore
.
filter
.
path
),
page
:
this
.
page
,
}
;
if
(
this
.
label
&&
data
.
label_name
)
{
data
.
label_name
=
data
.
label_name
.
filter
(
label
=>
label
!==
this
.
label
.
title
);
...
...
app/assets/javascripts/lib/utils/common_utils.js
View file @
4b1b5b0d
...
...
@@ -132,11 +132,9 @@ export const parseUrlPathname = url => {
return
parsedUrl
.
pathname
.
charAt
(
0
)
===
'
/
'
?
parsedUrl
.
pathname
:
`/
${
parsedUrl
.
pathname
}
`
;
};
function
splitPath
(
path
)
{
return
path
.
replace
(
/^
\?
/
,
''
)
.
split
(
'
&
'
);
}
const
splitPath
=
(
path
=
''
)
=>
path
.
replace
(
/^
\?
/
,
''
)
.
split
(
'
&
'
);
export
const
urlParamsToArray
=
(
path
=
''
)
=>
splitPath
(
path
)
.
filter
(
param
=>
param
.
length
>
0
)
...
...
@@ -149,7 +147,9 @@ export const getUrlParamsArray = () => urlParamsToArray(window.location.search);
export
const
urlParamsToObject
=
(
path
=
''
)
=>
splitPath
(
path
)
.
reduce
((
dataParam
,
filterParam
)
=>
{
if
(
filterParam
===
''
)
return
dataParam
;
if
(
filterParam
===
''
)
{
return
dataParam
;
}
const
data
=
dataParam
;
const
paramSplit
=
filterParam
.
split
(
'
=
'
);
...
...
ee/app/assets/javascripts/boards/stores/boards_store_ee.js
View file @
4b1b5b0d
...
...
@@ -34,7 +34,9 @@ class BoardsStoreEE {
};
this
.
store
.
updateFiltersUrl
=
(
replaceState
=
false
)
=>
{
if
(
!
this
.
store
.
filter
.
path
)
return
;
if
(
!
this
.
store
.
filter
.
path
)
{
return
;
}
if
(
replaceState
)
{
window
.
history
.
replaceState
(
null
,
null
,
`?
${
this
.
store
.
filter
.
path
}
`
);
}
else
{
...
...
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