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
514a5b25
Commit
514a5b25
authored
Aug 02, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add label to Projects dropdown, fix update url
parent
4a3e1fb7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
38 deletions
+43
-38
app/assets/javascripts/boards/components/board_new_issue.js
app/assets/javascripts/boards/components/board_new_issue.js
+42
-36
app/assets/javascripts/boards/components/board_sidebar.js
app/assets/javascripts/boards/components/board_sidebar.js
+0
-1
app/assets/javascripts/boards/models/issue.js
app/assets/javascripts/boards/models/issue.js
+1
-1
No files found.
app/assets/javascripts/boards/components/board_new_issue.js
View file @
514a5b25
...
...
@@ -81,18 +81,19 @@ export default {
},
mounted
()
{
this
.
$refs
.
input
.
focus
();
$
(
this
.
$refs
.
projectsDropdown
).
glDropdown
({
filterable
:
true
,
filterRemote
:
true
,
search
:
{
fields
:
[
'
name_with_namespace
'
],
},
data
(
term
,
callback
)
{
console
.
log
(
term
);
return
Api
.
groupProjects
(
this
.
groupId
,
term
,
callback
);
},
text
:
project
=>
project
.
name
,
});
if
(
this
.
groupId
)
{
$
(
this
.
$refs
.
projectsDropdown
).
glDropdown
({
filterable
:
true
,
filterRemote
:
true
,
search
:
{
fields
:
[
'
name_with_namespace
'
],
},
data
(
term
,
callback
)
{
return
Api
.
groupProjects
(
this
.
groupId
,
term
,
callback
);
},
text
:
project
=>
project
.
name
,
});
}
},
template
:
`
<div class="card board-new-issue-form">
...
...
@@ -113,31 +114,36 @@ export default {
ref="input"
autocomplete="off"
:id="list.id + '-title'" />
<div class="dropdown prepend-top-10">
<button
@click="loadProjects"
class="dropdown-menu-toggle"
type="button"
data-toggle="dropdown"
aria-expanded="false">
{{ selectedProject.name || 'Select a project' }}
<i class="fa fa-chevron-down"></i>
</button>
<div class="dropdown-menu dropdown-menu-selectable">
<ul>
<li v-for="project in projects">
<a
href="#"
role="button"
:class="{ 'is-active': project.id == selectedProject.id }"
@click.prevent="selectedProject = project">
{{ project.name }}
</a>
</li>
</ul>
<template v-if="groupId">
<label class="label-light prepend-top-10"
:for="list.id + '-project'">
Project
</label>
<div class="dropdown">
<button
@click="loadProjects"
class="dropdown-menu-toggle wide"
type="button"
data-toggle="dropdown"
aria-expanded="false">
{{ selectedProject.name || 'Select a project' }}
<i class="fa fa-chevron-down"></i>
</button>
<div class="dropdown-menu dropdown-menu-selectable wide">
<ul>
<li v-for="project in projects">
<a
href="#"
role="button"
:class="{ 'is-active': project.id == selectedProject.id }"
@click.prevent="selectedProject = project">
{{ project.name }}
</a>
</li>
</ul>
</div>
</div>
</
div
>
</
template
>
<div class="clearfix prepend-top-10">
<button class="btn btn-success pull-left"
type="submit"
...
...
app/assets/javascripts/boards/components/board_sidebar.js
View file @
514a5b25
...
...
@@ -59,7 +59,6 @@ gl.issueBoards.BoardSidebar = Vue.extend({
this
.
list
=
this
.
detail
.
list
;
this
.
$nextTick
(()
=>
{
new
UsersSelect
();
this
.
endpoint
=
this
.
$refs
.
assigneeDropdown
.
dataset
.
issueUpdate
;
});
},
...
...
app/assets/javascripts/boards/models/issue.js
View file @
514a5b25
...
...
@@ -90,7 +90,7 @@ class ListIssue {
data
.
issue
.
label_ids
=
[
''
];
}
return
Vue
.
http
.
patch
(
this
.
updateU
rl
,
data
);
return
Vue
.
http
.
patch
(
u
rl
,
data
);
}
}
...
...
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