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
dd93079a
Commit
dd93079a
authored
Nov 08, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed helper method to check for none on params
Moved if statements around in view
parent
0bc9008e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
app/helpers/todos_helper.rb
app/helpers/todos_helper.rb
+1
-1
app/views/dashboard/todos/index.html.haml
app/views/dashboard/todos/index.html.haml
+5
-5
No files found.
app/helpers/todos_helper.rb
View file @
dd93079a
...
@@ -62,7 +62,7 @@ module TodosHelper
...
@@ -62,7 +62,7 @@ module TodosHelper
end
end
def
todos_filter_empty?
def
todos_filter_empty?
todos_filter_params
.
all?
{
|
key
,
value
|
value
.
nil?
}
todos_filter_params
.
values
.
none?
end
end
def
todos_filter_path
(
options
=
{})
def
todos_filter_path
(
options
=
{})
...
...
app/views/dashboard/todos/index.html.haml
View file @
dd93079a
...
@@ -82,12 +82,9 @@
...
@@ -82,12 +82,9 @@
-
elsif
current_user
.
todos
.
any?
-
elsif
current_user
.
todos
.
any?
.todos-all-done
.todos-all-done
=
render
"shared/empty_states/todos_all_done.svg"
=
render
"shared/empty_states/todos_all_done.svg"
%h4
.text-center
-
if
todos_filter_empty?
Good job! Looks like you don't have any todos left.
-
else
There are no Todos to show.
-
if
todos_filter_empty?
-
if
todos_filter_empty?
%h4
.text-center
Good job! Looks like you don't have any todos left.
%p
.text-center
%p
.text-center
Are you looking for things to do? Take a look at
Are you looking for things to do? Take a look at
=
succeed
","
do
=
succeed
","
do
...
@@ -95,6 +92,9 @@
...
@@ -95,6 +92,9 @@
contribute to
contribute to
=
link_to
"merge requests"
,
merge_requests_dashboard_path
=
link_to
"merge requests"
,
merge_requests_dashboard_path
or mention someone in a comment to assign a new todo automatically.
or mention someone in a comment to assign a new todo automatically.
-
else
%h4
.text-center
There are no todos to show.
-
else
-
else
.todos-empty
.todos-empty
.todos-empty-hero
.todos-empty-hero
...
...
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