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
Jérome Perrin
gitlab-ce
Commits
3f713db0
Commit
3f713db0
authored
Feb 15, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update correct field for Notes - it's called note not description
parent
ced971b1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
1 deletion
+5
-1
app/assets/javascripts/issue.js
app/assets/javascripts/issue.js
+1
-0
app/assets/javascripts/merge_request.js
app/assets/javascripts/merge_request.js
+1
-0
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+1
-0
app/assets/javascripts/task_list.js
app/assets/javascripts/task_list.js
+2
-1
No files found.
app/assets/javascripts/issue.js
View file @
3f713db0
...
@@ -14,6 +14,7 @@ require('./task_list');
...
@@ -14,6 +14,7 @@ require('./task_list');
if
(
$
(
'
a.btn-close
'
).
length
)
{
if
(
$
(
'
a.btn-close
'
).
length
)
{
this
.
taskList
=
new
gl
.
TaskList
({
this
.
taskList
=
new
gl
.
TaskList
({
dataType
:
'
issue
'
,
dataType
:
'
issue
'
,
fieldName
:
'
description
'
,
selector
:
'
.detail-page-description
'
,
selector
:
'
.detail-page-description
'
,
onSuccess
:
(
result
)
=>
{
onSuccess
:
(
result
)
=>
{
document
.
querySelector
(
'
#task_status
'
).
innerText
=
result
.
task_status
;
document
.
querySelector
(
'
#task_status
'
).
innerText
=
result
.
task_status
;
...
...
app/assets/javascripts/merge_request.js
View file @
3f713db0
...
@@ -29,6 +29,7 @@ require('./merge_request_tabs');
...
@@ -29,6 +29,7 @@ require('./merge_request_tabs');
if
(
$
(
"
a.btn-close
"
).
length
)
{
if
(
$
(
"
a.btn-close
"
).
length
)
{
this
.
taskList
=
new
gl
.
TaskList
({
this
.
taskList
=
new
gl
.
TaskList
({
dataType
:
'
merge_request
'
,
dataType
:
'
merge_request
'
,
fieldName
:
'
description
'
,
selector
:
'
.detail-page-description
'
,
selector
:
'
.detail-page-description
'
,
onSuccess
:
(
result
)
=>
{
onSuccess
:
(
result
)
=>
{
document
.
querySelector
(
'
#task_status
'
).
innerText
=
result
.
task_status
;
document
.
querySelector
(
'
#task_status
'
).
innerText
=
result
.
task_status
;
...
...
app/assets/javascripts/notes.js
View file @
3f713db0
...
@@ -53,6 +53,7 @@ require('./task_list');
...
@@ -53,6 +53,7 @@ require('./task_list');
this
.
setupMainTargetNoteForm
();
this
.
setupMainTargetNoteForm
();
this
.
taskList
=
new
gl
.
TaskList
({
this
.
taskList
=
new
gl
.
TaskList
({
dataType
:
'
note
'
,
dataType
:
'
note
'
,
fieldName
:
'
note
'
,
selector
:
'
.notes
'
selector
:
'
.notes
'
});
});
this
.
collapseLongCommitList
();
this
.
collapseLongCommitList
();
...
...
app/assets/javascripts/task_list.js
View file @
3f713db0
...
@@ -4,6 +4,7 @@ class TaskList {
...
@@ -4,6 +4,7 @@ class TaskList {
constructor
(
options
=
{})
{
constructor
(
options
=
{})
{
this
.
selector
=
options
.
selector
;
this
.
selector
=
options
.
selector
;
this
.
dataType
=
options
.
dataType
;
this
.
dataType
=
options
.
dataType
;
this
.
fieldName
=
options
.
fieldName
;
this
.
onSuccess
=
options
.
onSuccess
||
(()
=>
{});
this
.
onSuccess
=
options
.
onSuccess
||
(()
=>
{});
this
.
init
();
this
.
init
();
}
}
...
@@ -24,7 +25,7 @@ class TaskList {
...
@@ -24,7 +25,7 @@ class TaskList {
const
$target
=
$
(
e
.
target
);
const
$target
=
$
(
e
.
target
);
const
patchData
=
{};
const
patchData
=
{};
patchData
[
this
.
dataType
]
=
{
patchData
[
this
.
dataType
]
=
{
description
:
$target
.
val
(),
[
this
.
fieldName
]
:
$target
.
val
(),
};
};
return
$
.
ajax
({
return
$
.
ajax
({
type
:
'
PATCH
'
,
type
:
'
PATCH
'
,
...
...
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