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
330e9136
Commit
330e9136
authored
Jun 09, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Uses update URL to update the status of a todo
parent
20d382a8
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
41 deletions
+51
-41
app/assets/javascripts/right_sidebar.js.coffee
app/assets/javascripts/right_sidebar.js.coffee
+37
-30
app/controllers/projects/todos_controller.rb
app/controllers/projects/todos_controller.rb
+12
-9
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
config/routes.rb
config/routes.rb
+1
-1
No files found.
app/assets/javascripts/right_sidebar.js.coffee
View file @
330e9136
...
@@ -47,27 +47,34 @@ class @Sidebar
...
@@ -47,27 +47,34 @@ class @Sidebar
.
off
'click'
,
'.js-issuable-todo'
.
off
'click'
,
'.js-issuable-todo'
.
on
'click'
,
'.js-issuable-todo'
,
@
toggleTodo
.
on
'click'
,
'.js-issuable-todo'
,
@
toggleTodo
toggleTodo
:
-
>
toggleTodo
:
(
e
)
=
>
$this
=
$
(
@
)
$this
=
$
(
e
.
currentTarget
)
$todoLoading
=
$
(
'.js-issuable-todo-loading'
)
$todoLoading
=
$
(
'.js-issuable-todo-loading'
)
$btnText
=
$
(
'.js-issuable-todo-text'
,
$this
)
$btnText
=
$
(
'.js-issuable-todo-text'
,
$this
)
ajaxType
=
if
$this
.
attr
(
'data-id'
)
then
'PATCH'
else
'POST'
ajaxUrlExtra
=
if
$this
.
attr
(
'data-id'
)
then
"/
#{
$this
.
attr
(
'data-id'
)
}
"
else
''
$
.
ajax
(
$
.
ajax
(
url
:
$this
.
data
(
'url'
)
url
:
"
#{
$this
.
data
(
'url'
)
}#{
ajaxUrlExtra
}
"
type
:
'POST'
type
:
ajaxType
dataType
:
'json'
dataType
:
'json'
data
:
data
:
todo_id
:
$this
.
attr
(
'data-id'
)
issuable_id
:
$this
.
data
(
'issuable'
)
issuable_id
:
$this
.
data
(
'issuable'
)
issuable_type
:
$this
.
data
(
'issuable-type'
)
issuable_type
:
$this
.
data
(
'issuable-type'
)
beforeSend
:
->
beforeSend
:
=>
$this
.
disable
()
@
beforeTodoSend
(
$this
,
$todoLoading
)
).
done
(
data
)
=>
@
todoUpdateDone
(
data
,
$this
,
$btnText
,
$todoLoading
)
beforeTodoSend
:
(
$btn
,
$todoLoading
)
->
$btn
.
disable
()
$todoLoading
.
removeClass
'hidden'
$todoLoading
.
removeClass
'hidden'
).
done
(
data
)
->
todoUpdateDone
:
(
data
,
$btn
,
$btnText
,
$todoLoading
)
->
$todoPendingCount
=
$
(
'.todos-pending-count'
)
$todoPendingCount
=
$
(
'.todos-pending-count'
)
$todoPendingCount
.
text
data
.
count
$todoPendingCount
.
text
data
.
count
$this
.
enable
()
$btn
.
enable
()
$todoLoading
.
addClass
'hidden'
$todoLoading
.
addClass
'hidden'
if
data
.
count
is
0
if
data
.
count
is
0
...
@@ -76,15 +83,15 @@ class @Sidebar
...
@@ -76,15 +83,15 @@ class @Sidebar
$todoPendingCount
.
removeClass
'hidden'
$todoPendingCount
.
removeClass
'hidden'
if
data
.
todo
?
if
data
.
todo
?
$this
$btn
.
attr
'aria-label'
,
$this
.
data
(
'mark-text'
)
.
attr
'aria-label'
,
$btn
.
data
(
'mark-text'
)
.
attr
'data-id'
,
data
.
todo
.
id
.
attr
'data-id'
,
data
.
todo
.
id
$btnText
.
text
$this
.
data
(
'mark-text'
)
$btnText
.
text
$btn
.
data
(
'mark-text'
)
else
else
$this
$btn
.
attr
'aria-label'
,
$this
.
data
(
'todo-text'
)
.
attr
'aria-label'
,
$btn
.
data
(
'todo-text'
)
.
removeAttr
'data-id'
.
removeAttr
'data-id'
$btnText
.
text
$this
.
data
(
'todo-text'
)
$btnText
.
text
$btn
.
data
(
'todo-text'
)
sidebarDropdownLoading
:
(
e
)
->
sidebarDropdownLoading
:
(
e
)
->
$sidebarCollapsedIcon
=
$
(
@
).
closest
(
'.block'
).
find
(
'.sidebar-collapsed-icon'
)
$sidebarCollapsedIcon
=
$
(
@
).
closest
(
'.block'
).
find
(
'.sidebar-collapsed-icon'
)
...
...
app/controllers/projects/todos_controller.rb
View file @
330e9136
class
Projects::TodosController
<
Projects
::
ApplicationController
class
Projects::TodosController
<
Projects
::
ApplicationController
def
create
def
create
json_data
=
Hash
.
new
if
params
[
:todo_id
].
nil?
TodoService
.
new
.
mark_todo
(
issuable
,
current_user
)
TodoService
.
new
.
mark_todo
(
issuable
,
current_user
)
json_data
[
:todo
]
=
current_user
.
todos
.
find_by
(
state: :pending
,
action:
Todo
::
MARKED
,
target_id:
issuable
.
id
)
render
json:
{
else
todo:
current_user
.
todos
.
find_by
(
state: :pending
,
action:
Todo
::
MARKED
,
target_id:
issuable
.
id
),
current_user
.
todos
.
find_by_id
(
params
[
:todo_id
]).
update
(
state: :done
)
count:
current_user
.
todos
.
pending
.
count
,
}
end
end
render
json:
json_data
.
merge
({
count:
current_user
.
todos
.
pending
.
count
})
def
update
current_user
.
todos
.
find_by_id
(
params
[
:id
]).
update
(
state: :done
)
render
json:
{
count:
current_user
.
todos
.
pending
.
count
,
}
end
end
private
private
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
330e9136
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
%a
.gutter-toggle.pull-right.js-sidebar-toggle
{
role:
"button"
,
href:
"#"
,
aria:
{
label:
"Toggle sidebar"
}
}
%a
.gutter-toggle.pull-right.js-sidebar-toggle
{
role:
"button"
,
href:
"#"
,
aria:
{
label:
"Toggle sidebar"
}
}
=
sidebar_gutter_toggle_icon
=
sidebar_gutter_toggle_icon
-
if
current_user
-
if
current_user
%button
.btn.btn-default.issuable-header-btn.pull-right.js-issuable-todo
{
type:
"button"
,
aria:
{
label:
(
todo
.
nil?
?
"Add Todo"
:
"Mark Done"
)
},
data:
{
todo_text:
"Add Todo"
,
mark_text:
"Mark Done"
,
id:
(
todo
.
id
unless
todo
.
nil?
),
issuable:
issuable
.
id
,
issuable_type:
issuable
.
class
.
name
.
underscore
,
url:
namespace_project_todos_path
(
@project
.
namespace
,
@project
,
:json
)
}
}
%button
.btn.btn-default.issuable-header-btn.pull-right.js-issuable-todo
{
type:
"button"
,
aria:
{
label:
(
todo
.
nil?
?
"Add Todo"
:
"Mark Done"
)
},
data:
{
todo_text:
"Add Todo"
,
mark_text:
"Mark Done"
,
id:
(
todo
.
id
unless
todo
.
nil?
),
issuable:
issuable
.
id
,
issuable_type:
issuable
.
class
.
name
.
underscore
,
url:
namespace_project_todos_path
(
@project
.
namespace
,
@project
)
}
}
%span
.js-issuable-todo-text
%span
.js-issuable-todo-text
-
if
todo
.
nil?
-
if
todo
.
nil?
Add Todo
Add Todo
...
...
config/routes.rb
View file @
330e9136
...
@@ -789,7 +789,7 @@ Rails.application.routes.draw do
...
@@ -789,7 +789,7 @@ Rails.application.routes.draw do
end
end
end
end
resources
:todos
,
only:
[
:create
],
constraints:
{
id:
/\d+/
}
resources
:todos
,
only:
[
:create
,
:update
],
constraints:
{
id:
/\d+/
}
resources
:uploads
,
only:
[
:create
]
do
resources
:uploads
,
only:
[
:create
]
do
collection
do
collection
do
...
...
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