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
57d16552
Commit
57d16552
authored
Feb 20, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include 'issue'/'merge request' in link
parent
0e977581
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
10 deletions
+5
-10
app/helpers/todos_helper.rb
app/helpers/todos_helper.rb
+3
-8
app/views/dashboard/todos/_todo.html.haml
app/views/dashboard/todos/_todo.html.haml
+2
-2
No files found.
app/helpers/todos_helper.rb
View file @
57d16552
...
@@ -7,14 +7,9 @@ module TodosHelper
...
@@ -7,14 +7,9 @@ module TodosHelper
current_user
.
todos
.
done
.
count
current_user
.
todos
.
done
.
count
end
end
def
todo_action_name
(
todo
)
def
todo_target_link
(
todo
)
target
=
todo
.
target_type
.
titleize
.
downcase
target
=
todo
.
target_type
.
titleize
.
downcase
link_to
"
#{
target
}
#{
todo
.
target
.
to_reference
}
"
,
todo_target_path
(
todo
)
[
todo
.
action_name
,
target
].
join
(
" "
)
end
def
todo_target_link_html
(
todo
)
link_to
"#
#{
todo
.
target_iid
}
"
,
todo_target_path
(
todo
)
end
end
def
todo_target_path
(
todo
)
def
todo_target_path
(
todo
)
...
...
app/views/dashboard/todos/_todo.html.haml
View file @
57d16552
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
%span
.author_name
%span
.author_name
=
link_to_author
todo
=
link_to_author
todo
%span
.todo_label
%span
.todo_label
=
todo
_action_name
(
todo
)
=
todo
.
action_name
=
todo_target_link
_html
(
todo
)
=
todo_target_link
(
todo
)
·
#{
time_ago_with_tooltip
(
todo
.
created_at
)
}
·
#{
time_ago_with_tooltip
(
todo
.
created_at
)
}
...
...
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