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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
e140675e
Commit
e140675e
authored
Jan 30, 2017
by
Phil Hughes
Committed by
Fatih Acet
Feb 03, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue link href
parent
6c828906
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
6 deletions
+16
-6
app/assets/javascripts/boards/components/modal/index.js.es6
app/assets/javascripts/boards/components/modal/index.js.es6
+4
-2
app/assets/javascripts/boards/components/modal/list.js.es6
app/assets/javascripts/boards/components/modal/list.js.es6
+10
-3
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/index.js.es6
View file @
e140675e
...
...
@@ -9,7 +9,7 @@
gl.issueBoards.IssuesModal = Vue.extend({
props: [
'blankStateImage', 'newIssuePath', 'bulkUpdatePath',
'blankStateImage', 'newIssuePath', 'bulkUpdatePath',
'issueLinkBase',
],
data() {
return ModalStore.store;
...
...
@@ -81,7 +81,9 @@
v-if="showAddIssuesModal">
<div class="add-issues-container">
<modal-header></modal-header>
<modal-list v-if="!loading && showList"></modal-list>
<modal-list
:issue-link-base="issueLinkBase"
v-if="!loading && showList"></modal-list>
<empty-state
v-if="(!loading && issues.length === 0) || (activeTab === 'selected' && selectedIssues.length === 0)"
:image="blankStateImage"
...
...
app/assets/javascripts/boards/components/modal/list.js.es6
View file @
e140675e
...
...
@@ -6,6 +6,9 @@
const ModalStore = gl.issueBoards.ModalStore;
gl.issueBoards.ModalList = Vue.extend({
props: [
'issueLinkBase',
],
data() {
return ModalStore.store;
},
...
...
@@ -34,7 +37,11 @@
},
},
methods: {
toggleIssue: ModalStore.toggleIssue.bind(ModalStore),
toggleIssue(e, issue) {
if (e.target.tagName !== 'A') {
ModalStore.toggleIssue(issue);
}
},
listHeight() {
return this.$refs.list.getBoundingClientRect().height;
},
...
...
@@ -100,10 +107,10 @@
<div
class="card"
:class="{ 'is-active': issue.selected }"
@click="toggleIssue(issue)">
@click="toggleIssue(
$event,
issue)">
<issue-card-inner
:issue="issue"
:issue-link-base="
'/'
">
:issue-link-base="
issueLinkBase
">
</issue-card-inner>
<span
v-if="issue.selected"
...
...
app/views/projects/boards/_show.html.haml
View file @
e140675e
...
...
@@ -28,4 +28,5 @@
=
render
"projects/boards/components/sidebar"
%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
),
"bulk-update-path"
=>
bulk_update_namespace_project_issues_path
(
@project
.
namespace
,
@project
)
}
"bulk-update-path"
=>
bulk_update_namespace_project_issues_path
(
@project
.
namespace
,
@project
),
":issue-link-base"
=>
"issueLinkBase"
}
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