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
9e27bf87
Commit
9e27bf87
authored
Aug 07, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use id instead of iid for issues
parent
34401f4b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
15 deletions
+16
-15
app/assets/javascripts/boards/components/board_sidebar.js
app/assets/javascripts/boards/components/board_sidebar.js
+2
-4
app/assets/javascripts/boards/components/issue_card_inner.js
app/assets/javascripts/boards/components/issue_card_inner.js
+9
-6
app/assets/javascripts/boards/components/modal/footer.js
app/assets/javascripts/boards/components/modal/footer.js
+1
-1
app/assets/javascripts/boards/components/sidebar/remove_issue.js
...ets/javascripts/boards/components/sidebar/remove_issue.js
+1
-1
app/assets/javascripts/boards/models/issue.js
app/assets/javascripts/boards/models/issue.js
+2
-2
app/assets/javascripts/boards/models/list.js
app/assets/javascripts/boards/models/list.js
+1
-1
No files found.
app/assets/javascripts/boards/components/board_sidebar.js
View file @
9e27bf87
...
...
@@ -58,10 +58,8 @@ gl.issueBoards.BoardSidebar = Vue.extend({
this
.
list
=
this
.
detail
.
list
;
this
.
$nextTick
(()
=>
{
var
issueUrl
=
this
.
$refs
.
assigneeDropdown
.
dataset
.
issueUpdate
issueUrl
=
issueUrl
.
replace
(
"
:project_path
"
,
this
.
issue
.
project
.
path
);
let
issueUrl
=
this
.
$refs
.
assigneeDropdown
.
dataset
.
issueUpdate
;
issueUrl
=
issueUrl
.
replace
(
'
:project_path
'
,
this
.
issue
.
project
.
path
);
this
.
endpoint
=
issueUrl
;
});
},
...
...
app/assets/javascripts/boards/components/issue_card_inner.js
View file @
9e27bf87
...
...
@@ -68,16 +68,19 @@ gl.issueBoards.IssueCardInner = Vue.extend({
return
this
.
issue
.
assignees
.
length
>
this
.
numberOverLimit
;
},
cardUrl
()
{
var
baseUrl
=
this
.
issueLinkBase
;
let
baseUrl
=
this
.
issueLinkBase
;
if
(
this
.
groupId
&&
this
.
issue
.
project
)
{
baseUrl
=
this
.
issueLinkBase
.
replace
(
"
:project_path
"
,
this
.
issue
.
project
.
path
);
if
(
this
.
groupId
&&
this
.
issue
.
project
)
{
baseUrl
=
this
.
issueLinkBase
.
replace
(
'
:project_path
'
,
this
.
issue
.
project
.
path
);
}
return
`
${
baseUrl
}
/
${
this
.
issue
.
id
}
`
;
return
`
${
baseUrl
}
/
${
this
.
issue
.
i
i
d
}
`
;
},
issueId
()
{
return
`#
${
this
.
issue
.
id
}
`
;
if
(
this
.
issue
.
iid
)
{
return
`#
${
this
.
issue
.
iid
}
`
;
}
return
false
;
},
showLabelFooter
()
{
return
this
.
issue
.
labels
.
find
(
l
=>
this
.
showLabel
(
l
))
!==
undefined
;
...
...
@@ -154,7 +157,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
:title="issue.title">{{ issue.title }}</a>
<span
class="card-number"
v-if="issue
.i
d"
v-if="issue
I
d"
>
{{ issueId }}
</span>
...
...
app/assets/javascripts/boards/components/modal/footer.js
View file @
9e27bf87
...
...
@@ -29,7 +29,7 @@ gl.issueBoards.ModalFooter = Vue.extend({
const
firstListIndex
=
1
;
const
list
=
this
.
modal
.
selectedList
||
this
.
state
.
lists
[
firstListIndex
];
const
selectedIssues
=
ModalStore
.
getSelectedIssues
();
const
issueIds
=
selectedIssues
.
map
(
issue
=>
issue
.
globalI
d
);
const
issueIds
=
selectedIssues
.
map
(
issue
=>
issue
.
i
d
);
// Post the data to the backend
gl
.
boardService
.
bulkUpdate
(
issueIds
,
{
...
...
app/assets/javascripts/boards/components/sidebar/remove_issue.js
View file @
9e27bf87
...
...
@@ -33,7 +33,7 @@ gl.issueBoards.RemoveIssueBtn = Vue.extend({
}
// Post the remove data
gl
.
boardService
.
bulkUpdate
([
issue
.
globalI
d
],
data
).
catch
(()
=>
{
gl
.
boardService
.
bulkUpdate
([
issue
.
i
d
],
data
).
catch
(()
=>
{
new
Flash
(
'
Failed to remove issue from board, please try again.
'
,
'
alert
'
);
lists
.
forEach
((
list
)
=>
{
...
...
app/assets/javascripts/boards/models/issue.js
View file @
9e27bf87
...
...
@@ -8,8 +8,8 @@ import Vue from 'vue';
class
ListIssue
{
constructor
(
obj
,
defaultAvatar
)
{
this
.
globalI
d
=
obj
.
id
;
this
.
id
=
obj
.
iid
;
this
.
i
d
=
obj
.
id
;
this
.
i
i
d
=
obj
.
iid
;
this
.
title
=
obj
.
title
;
this
.
confidential
=
obj
.
confidential
;
this
.
dueDate
=
obj
.
due_date
;
...
...
app/assets/javascripts/boards/models/list.js
View file @
9e27bf87
...
...
@@ -175,7 +175,7 @@ class List {
}
findIssue
(
id
)
{
return
this
.
issues
.
fi
lter
(
issue
=>
issue
.
id
===
id
)[
0
]
;
return
this
.
issues
.
fi
nd
(
issue
=>
issue
.
id
===
id
)
;
}
removeIssue
(
removeIssue
)
{
...
...
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